X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxConceptControl.cxx;h=a205f95a1bccf7d77466cdbc0c30a273bd8b8597;hb=ddf2bb21801064ffc7aa5779a5e58edadbd767bc;hp=ceb3f8a0643ff344f3fe46f9d3e9028ca4dadb07;hpb=507a00d9d7800568d6e8ae91905f2b07cd2b30ae;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
index ceb3f8a..a205f95 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
@@ -45,38 +45,35 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
 	
-	wxConceptControl :: wxConceptControl(wxWindow *parent, bool orientation, int minV, int maxV,  int actualV, std::string &aConceptName, std::string elementsDef )
+	wxConceptControl::wxConceptControl(wxWindow *parent, bool orientation, int minV, int maxV,  int actualV, std::string &aConceptName, std::string elementsDef )
 	:wxPanel(parent, -1, wxDefaultPosition, parent->GetSize(), wxTAB_TRAVERSAL)
 	{
-
-		minValue = minV;
-		maxValue = maxV;
-		_numCheckBox = 0;
-		
-		showLabels = true;
-
-		wxFlexGridSizer* sizer = new wxFlexGridSizer (1, 3, 15, 15);
-
+		minValue 		= minV;
+		maxValue 		= maxV;
+		_numCheckBox 	= 0;	
+		showLabels 		= true;
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+		wxFlexGridSizer* sizer = new wxFlexGridSizer(1, 3, 15, 15);
+#else
+		wxFlexGridSizer* sizer = new wxFlexGridSizer(3);
+#endif
 		conceptName = new wxStaticText(this, -1, wxString(aConceptName.c_str(),wxConvUTF8), wxDefaultPosition, wxSize(90,20), wxALIGN_CENTRE );		
 		sizer->Add( conceptName, 0, wxALIGN_CENTRE |wxALIGN_CENTER_HORIZONTAL);
-		
 		if(orientation)
 		{
 			sizer->AddGrowableCol(1);
 			conceptSlider = new wxSlider(this, -1, actualV, minV, maxV, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL| wxSL_AUTOTICKS | wxSL_LABELS, wxDefaultValidator, wxString(aConceptName.c_str(),wxConvUTF8));			
-		}
-		else
-		{			
-			sizer->AddGrowableRow(1);
+		} else {			
+//			sizer->AddGrowableRow(1);
 			conceptSlider = new wxSlider(this, -1, actualV, minV, maxV, wxDefaultPosition, wxDefaultSize, wxSL_LEFT| wxSL_AUTOTICKS | wxSL_LABELS, wxDefaultValidator, wxString(aConceptName.c_str(),wxConvUTF8) );			
 		}
 		sizer->Add(conceptSlider, 0, wxGROW |wxALL );		
 		createElements( sizer, elementsDef );
 		SetSizer( sizer );
-
 		Connect( conceptSlider->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler(wxConceptControl::onSliderTrack));//(wxObjectEventFunction) &wxConceptControl :: onSliderRelease ); 
 		Connect( conceptSlider->GetId(),  wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler(wxConceptControl::onSliderRelease));//(wxObjectEventFunction) &wxConceptControl :: onSliderTrack );     
-
 		this->SetAutoLayout( true );
 		this->Layout();	
 	}
@@ -232,11 +229,16 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
 	//------------------------------------------------------------------------------------------------------------
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
-	void wxConceptControl :: createElements(wxSizer *sizer , std::string elementsDef )
+	void wxConceptControl::createElements(wxSizer *sizer , std::string elementsDef )
 	{
 		const char * elements = elementsDef.c_str();
 		int elementsNum = elementsDef.size();
-		wxFlexGridSizer* checkSizer = new wxFlexGridSizer (1, elementsNum, 5, 5);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+		wxFlexGridSizer* checkSizer = new wxFlexGridSizer(1, elementsNum, 5, 5);
+#else
+		wxFlexGridSizer* checkSizer = new wxFlexGridSizer(elementsNum);
+#endif
 		int i,ckecks = 0;
 		for( i = 0;*elements!= 0; elements++)
 		{			
@@ -250,8 +252,7 @@ DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
 				}*/
 				createCheckBoxAndAddToSizer( checkSizer, "X", -1, ckecks);
 				ckecks++;
-			}
-			else if ( a == 84 || a==116 )// Including T:84 or t t:116 as textCtrl (ASCII)
+			} else if ( a == 84 || a==116 )// Including T:84 or t t:116 as textCtrl (ASCII)
 			{
 
 			}