From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Tue, 7 Aug 2018 10:58:50 +0000 (+0200)
Subject: #3207
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=refs%2Fheads%2Fvtk7itk4wx3-mingw64;p=creaMaracasVisu.git

#3207
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
index e9b5532..72fa34e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
@@ -95,16 +95,6 @@ wxVtkClipping3DViewVolCntrlPanel::wxVtkClipping3DViewVolCntrlPanel(wxWindow *par
     sizerH2->Add(ckInterpolation, 1, wxALL|wxEXPAND, 0 );
     sizerH2->Add(ckShade, 1, wxALL|wxEXPAND, 0 );
 
-
-#if wxMAJOR_VERSION <= 2
-	// ..
-#else
-	#if defined(WIN32)
-		// EED 2018-08-02  Black line  ????????????
-		// But if I put text a Black line appears why  ?????
-		sizer->Add( new wxButton(panel,-1,_T("."))	, 1, wxALL, 0);
-	#endif
-#endif
 	sizer->Add( sizerH0 , 1, wxALL|wxEXPAND, 2);
     sizer->Add( sizerH1 , 1, wxALL|wxEXPAND, 2);
     sizer->Add( sizerH2 , 1, wxALL|wxEXPAND, 2);
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
index 044fbcd..33294b4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -148,8 +148,7 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 
 	if(align)
 	{
-		sizer	= new wxFlexGridSizer(1);
-		sizerV1	= new wxFlexGridSizer(4);
+		sizer	= new wxFlexGridSizer(4);
 		sizerH4 = new wxFlexGridSizer(3);
 				
 		sizerH4->Add( new wxStaticText(panel, -1,_T(" "))	, 1, wxALL|wxEXPAND, 0);
@@ -189,22 +188,10 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
 		sizerH6->Add( _ckBoxOutline					, 1, wxALL|wxEXPAND, 0);
 		sizerH6->Add( _ckBoxBackGroundBlack			, 1, wxALL|wxEXPAND, 0);
 
-		sizerV1->Add( sizerH4,  1, wxALL|wxGROW,	2);
-		sizerV1->Add( sizerH5,  1, wxALL|wxEXPAND,2);
-		sizerV1->Add( sizerH6,  1, wxALL|wxEXPAND,2);
-	
-#if wxMAJOR_VERSION <= 2
-	// ..
-#else
-	#if defined(WIN32)
-		// EED 2018-08-02  Black line  ????????????
-		// But if I put text a Black line appears why  ?????
-		sizer->Add( new wxButton(panel,-1,_T("."))	, 1, wxALL, 0);
-	#endif
-#endif
-		sizer->Add( sizerV1,  1, wxALL|wxEXPAND,0);
-		
-		
+		sizer->Add( sizerH4,  1, wxALL|wxGROW,	2);
+		sizer->Add( sizerH5,  1, wxALL|wxEXPAND,2);
+		sizer->Add( sizerH6,  1, wxALL|wxEXPAND,2);
+			
 	}	else	{
 		sizer	 = new wxFlexGridSizer(1);