#3207 creaMaracasVisu Feature New Normal branch vtk7itk4wx3-mingw

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
index c23118a70854084f3f5266e2ebb809c28bb0708f..e9b5532dbe8100effbdaa650e56d4a3a66891183 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewVolCntrlPanel.cxx
@@ -96,6 +96,15 @@ wxVtkClipping3DViewVolCntrlPanel::wxVtkClipping3DViewVolCntrlPanel(wxWindow *par
     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 a2039f6d9545815ec671d8493454498b8d5e7606..044fbcd887c4938d59934652ca17953f37550d04 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkMPR3DViewCntrlPanel.cxx
@@ -141,15 +141,17 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        //      wxBoxSizer *sizerH4 = new wxBoxSizer(wxHORIZONTAL);
        
        //CPR: If-else statements added 30 Nov 2009
+       wxFlexGridSizer *sizerV1;
        wxFlexGridSizer *sizerH4;
        wxFlexGridSizer *sizerH5;
        wxFlexGridSizer *sizerH6;
 
        if(align)
        {
-               sizer   = new wxFlexGridSizer(4);
+               sizer   = new wxFlexGridSizer(1);
+               sizerV1 = new wxFlexGridSizer(4);
                sizerH4 = new wxFlexGridSizer(3);
-               
+                               
                sizerH4->Add( new wxStaticText(panel, -1,_T(" "))       , 1, wxALL|wxEXPAND, 0);
                sizerH4->Add( new wxStaticText(panel, -1,_T("GL"))      , 1, wxALL|wxEXPAND, 0);
                sizerH4->Add( new wxStaticText(panel, -1,_T("Color   "))        , 1, wxALL|wxEXPAND, 0);
@@ -170,12 +172,8 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
                sizerH4->Add( _ckBoxInterpolate                         , 1, wxALL|wxEXPAND, 0);
                sizerH4->Add( new wxStaticText(panel, -1,_T(" "))       , 1, wxALL|wxEXPAND, 0);
                sizerH4->Add( new wxStaticText(panel, -1,_T(" "))       , 1, wxALL|wxEXPAND, 0);
-               
-               
-               
-               
+                               
                sizerH5 = new wxFlexGridSizer(1);
-               sizerH5->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND, 0);
                sizerH5->Add( _ckBoxXYZ                                 , 1, wxALL|wxEXPAND, 0);
                sizerH5->Add( _ckBoxPlane                               , 1, wxALL|wxEXPAND, 0);                
                sizerH5->Add( new wxStaticText(panel, -1,_T("      "))  , 1, wxALL|wxEXPAND, 0);
@@ -191,10 +189,20 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
                sizerH6->Add( _ckBoxOutline                                     , 1, wxALL|wxEXPAND, 0);
                sizerH6->Add( _ckBoxBackGroundBlack                     , 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);
+               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);
                
                
        }       else    {
@@ -268,7 +276,9 @@ wxVtkMPR3DViewCntrlPanel::wxVtkMPR3DViewCntrlPanel(wxWindow *parent, wxVtkMPR3DV
        //      sizerH5->Add( ckBoxZ                            ,  1, wxALL|wxEXPAND, 0);
 
 
-       panel->SetSize(400,50);
+       panel->ClearBackground();
+//     panel->SetSize(400,50);
+       sizer->FitInside(panel);
        panel->SetAutoLayout(true);
        panel->SetSizer(sizer);
        panel->Layout();