X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxComboBox.cxx;h=06ec5912e0d115e929e31be9711424aab6d10a51;hb=34a4b6e0dbf8373c79c665f64ff2d7ca6c911045;hp=8b2ea6479994078fb7d8d89022cd8f34382064ab;hpb=19dda39fbfb4f8e1019c4f0dd37aa3afc8a3d1d6;p=bbtk.git

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 8b2ea64..06ec591 100644
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -54,14 +54,13 @@ namespace bbwx
 			int sizeY
 		)
     :
-    wxPanel( parent, -1,wxDefaultPosition,wxSize(sizeX,sizeY) ) ,
+    wxPanel( parent, -1,wxDefaultPosition ) ,
     mBox(box),
     mTypeForm(typeForm)
   {
-	wxPanel 	*panel		= this;
 	itemcontainer			= NULL;
-   	int i;
-
+	wxPanel 		*panel	= this;
+   	int 			i;
     //---------------------------------------------------------------------
     // 2) Insertion of the components in the window
     
@@ -71,8 +70,6 @@ namespace bbwx
     {
 	   sizer->Add( new wxStaticText(panel,-1,  bbtk::std2wx(title) ) ); 
     }
-    sizer->AddGrowableCol(0);
-    panel->SetSizer(sizer);
     //---------------------------------------------------------------------
 	if (mTypeForm==1)
 	{
@@ -82,12 +79,15 @@ namespace bbwx
 	 	Connect( wxlistbox->GetId(), 
                  wxEVT_COMMAND_LISTBOX_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox ); 
 	} else if (mTypeForm==0) {
- 		wxChoice *wxchoice = new wxChoice ( panel , -1 );
+		wxChoice *wxchoice = new wxChoice ( panel , -1, wxDefaultPosition,wxSize(sizeX,sizeY));
 		itemcontainer=wxchoice;
 		sizer->Add( wxchoice,1,wxGROW ); 
  		Connect( wxchoice->GetId(), 
                  wxEVT_COMMAND_CHOICE_SELECTED, (wxObjectEventFunction) (void (wxPanel::*)(wxEvent&))&ComboBoxWidget::OnComboBox ); 
 	}
+    sizer->AddGrowableCol(0);
+    panel->SetSizer(sizer);
+	
 	for (i=0;i<lstIn.size(); i++)
 	{
 		itemcontainer->Append(  bbtk::std2wx( lstIn[i] )  ); 
@@ -121,33 +121,40 @@ namespace bbwx
 		mBox->bbSetOutputOut( iSelection );
 		mBox->bbSetOutputOutString(    bbtk::wx2std( itemcontainer->GetString(iSelection) )     );
 		mBox->bbSignalOutputModification();
-
 		VerifyDeselect(iSelection);
+		if (mTypeForm==0) 
+		{ 
+			wxChoice *wxchoise=(wxChoice *)itemcontainer;
+			wxchoise->SetToolTip( itemcontainer->GetString(iSelection)    );
+		} // if mTypeForm
+
 
 //		mBox->bbSignalOutputModification("Out");
 //		mBox->bbSignalOutputModification("OutString");
 	} // if iSelection
   }
 
-  //--------------------------------------------------------------------------
-  void ComboBoxWidget::OnComboBox(wxEvent& event)
-  {
+//--------------------------------------------------------------------------
+void ComboBoxWidget::OnComboBox(wxEvent& event)
+{
 	OnComboBoxSelection( itemcontainer->GetSelection() );
-  }
+}
+
 //--------------------------------------------------------------------------
-  void ComboBoxWidget::FillItems( int iSelection, std::vector< std::string > lstIn )
+void ComboBoxWidget::FillItems( int iSelection, std::vector< std::string > lstIn )
+{
+	int i;
+	itemcontainer->Clear();
+	for (i=0;i<lstIn.size(); i++)
 	{
-		int i;
-		itemcontainer->Clear();
-    	for (i=0;i<lstIn.size(); i++)
-    	{
-  		 	itemcontainer->Append(  bbtk::std2wx( lstIn[i] )  ); 
-	 	} // for i
-		if (iSelection>=0) itemcontainer->SetSelection(iSelection);
-	} 
+	 	itemcontainer->Append(  bbtk::std2wx( lstIn[i] )  ); 
+ 	} // for i
+	if (iSelection>=0) itemcontainer->SetSelection(iSelection);
+} 
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,ComboBox)
 BBTK_BLACK_BOX_IMPLEMENTATION(ComboBox,bbtk::WxBlackBox);
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
@@ -155,16 +162,16 @@ void ComboBox::Process()
 {
 	int iSelection = bbGetInputSelection();
 	if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=bbGetInputIn().size()-1; }
+//	if (bbGetInputSelection() >= bbGetInputIn().size()) { iSelection=0; }
 	ComboBoxWidget *w = (ComboBoxWidget*)bbGetOutputWidget();
 	w->FillItems( iSelection, bbGetInputIn() );
     bbSetInputSelection( iSelection );
     bbSetOutputOut( iSelection );
     int size = bbGetInputIn().size();
-    if 	(  (iSelection>0) && ( (size-1)<=iSelection) ) 
+    if 	(  (iSelection>=0) && ( iSelection<size) ) 
     { 
        bbSetOutputOutString( bbGetInputIn()[ iSelection ] );
     } // if iSelection
-
 	w->VerifyDeselect(iSelection);
 }
 //===== 
@@ -181,7 +188,10 @@ void ComboBox::CreateWidget(wxWindow* parent)
                          	bbGetInputForm(),
 							bbGetInputWinWidth(), bbGetInputWinHeight()  );
    bbSetOutputOut( bbGetInputSelection() );
-   bbSetOutputOutString( bbGetInputIn()[ bbGetInputSelection() ] );
+   if (bbGetInputIn().size()> bbGetInputSelection() )
+   {
+	   bbSetOutputOutString( bbGetInputIn()[ bbGetInputSelection() ] );
+   } // if InputIn size
    bbSetOutputWidget( w );
 }
 //===== 
@@ -192,8 +202,8 @@ void ComboBox::bbUserSetDefaultValues()
 	bbSetInputSelection(0);
 	bbSetInputTitle("");
 	bbSetInputForm(0);
-	bbSetInputWinWidth(100);
-	bbSetInputWinHeight(200);
+	bbSetInputWinWidth(10);
+	bbSetInputWinHeight(45);
 	bbSetInputDeselect(false);
 }
 //=====