X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=ab6e16af43d0418e790435f5e525035e3f9e9f10;hb=467a79557211bf3735c87284bb320b9a9bd62436;hp=5664c50d3aed65200f0afae5de487d376870d5bc;hpb=de76ec742d17da9747b691dd168a8d832a64168e;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 5664c50..ab6e16a 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -423,7 +423,12 @@ void wxCDMMainFrame::OnMenuNewProject(wxCommandEvent& event)
           wxT("Project Actions Panel"),
           wxDefaultPosition,
           wxSize(800,200),
-          0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
       );
       
       auiManager.AddPane(panel_ProjectActions, wxAuiPaneInfo().Bottom().MinSize(800,50).Name(wxT("panel_ProjectActions")).Caption(wxT("General Project Actions")).BestSize(800,70).CloseButton(false));
@@ -525,7 +530,12 @@ void wxCDMMainFrame::OnMenuOpenRecent(wxCommandEvent& event)
       wxT("Project Actions Panel"),
       wxDefaultPosition,
       wxSize(800,200),
-      0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
   );
   panel_ProjectActions->SetMinSize(wxSize(500, 100));
 
@@ -617,7 +627,12 @@ void wxCDMMainFrame::OnMenuOpenProject(wxCommandEvent& event)
           wxT("Project Actions Panel"),
           wxDefaultPosition,
           wxSize(800,200),
-          0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
       );
       panel_ProjectActions->SetMinSize(wxSize(500, 100));
 
@@ -892,12 +907,15 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
               wxT("Description Panel"),
               wxDefaultPosition,
               wxSize(600, 400),
-              0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
           );
 
-        }
-      else
-        {
+        } else {
           //appli
           modelCDMAppli* elementAppli = dynamic_cast<modelCDMAppli*>(element);
           if(elementAppli != NULL)
@@ -910,12 +928,15 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                   wxT("Description Panel"),
                   wxDefaultPosition,
                   wxSize(600, 400),
-                  0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
               );
 
-            }
-          else
-            {
+            } else {
               //application
               modelCDMApplication* elementApplication = dynamic_cast<modelCDMApplication*>(element);
 			  if(elementApplication != NULL)
@@ -928,11 +949,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                       wxT("Description Panel"),
                       wxDefaultPosition,
                       wxSize(600, 400),
-                      0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                   );
-                }
-              else
-                {
+                } else {
                   //lib
                   modelCDMLib* elementLib = dynamic_cast<modelCDMLib*>(element);
                   if(elementLib != NULL)
@@ -945,11 +969,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                           wxT("Description Panel"),
                           wxDefaultPosition,
                           wxSize(600, 400),
-                          0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                       );
-                    }
-                  else
-                    {
+                    } else {
                       //library
                       modelCDMLibrary* elementLibrary = dynamic_cast<modelCDMLibrary*>(element);
                       if(elementLibrary != NULL)
@@ -962,11 +989,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                               wxT("Description Panel"),
                               wxDefaultPosition,
                               wxSize(600, 400),
-                              0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                           );
-                        }
-                      else
-                        {
+                        } else {
                           //package
                           modelCDMPackage* elementPackage = dynamic_cast<modelCDMPackage*>(element);
                           if(elementPackage != NULL)
@@ -978,12 +1008,17 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                   ID_WINDOW_PROPERTIES,
                                   wxT("Description Panel"),
                                   wxDefaultPosition,
-                                  wxSize(600, 400),
-                                  0
+                                  wxSize(600, 100),
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                               );
-                            }
-                          else
-                            {
+
+
+                            } else {
                               //black box
                               modelCDMBlackBox* elementBlackBox = dynamic_cast<modelCDMBlackBox*>(element);
                               if(elementBlackBox != NULL)
@@ -996,11 +1031,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                       wxT("Description Panel"),
                                       wxDefaultPosition,
                                       wxSize(600, 400),
-                                      0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                   );
-                                }
-                              else
-                                {
+                                } else {
                                   //CMakeLists
                                   modelCDMCMakeListsFile* elementCMakeLists = dynamic_cast<modelCDMCMakeListsFile*>(element);
                                   if(elementCMakeLists != NULL)
@@ -1013,11 +1051,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                           wxT("Description Panel"),
                                           wxDefaultPosition,
                                           wxSize(600, 400),
-                                          0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                       );
-                                    }
-                                  else
-                                    {
+                                    } else {
                                       //CodeFile
                                       modelCDMCodeFile* elementCodeFile = dynamic_cast<modelCDMCodeFile*>(element);
                                       if(elementCodeFile != NULL)
@@ -1030,11 +1071,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                               wxT("Description Panel"),
                                               wxDefaultPosition,
                                               wxSize(600, 400),
-                                              0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                           );
-                                        }
-                                      else
-                                        {
+                                        } else {
                                           //BBSFile
                                           modelCDMBBSFile* elementBBSFile = dynamic_cast<modelCDMBBSFile*>(element);
                                           if(elementBBSFile != NULL)
@@ -1047,11 +1091,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                   wxT("Description Panel"),
                                                   wxDefaultPosition,
                                                   wxSize(600, 400),
-                                                  0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                               );
-                                            }
-                                          else
-                                            {
+                                            } else {
                                               //BBSFile
                                               modelCDMBBGFile* elementBBGFile = dynamic_cast<modelCDMBBGFile*>(element);
                                               if(elementBBGFile != NULL)
@@ -1064,11 +1111,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                       wxT("Description Panel"),
                                                       wxDefaultPosition,
                                                       wxSize(600, 400),
-                                                      0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                                   );
-                                                }
-                                              else
-                                                {
+                                                } else {
                                                   //folder
                                                   modelCDMFolder* elementFolder = dynamic_cast<modelCDMFolder*>(element);
                                                   if(elementFolder != NULL)
@@ -1081,11 +1131,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                           wxT("Description Panel"),
                                                           wxDefaultPosition,
                                                           wxSize(600, 400),
-                                                          0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                                       );
-                                                    }
-                                                  else
-                                                    {
+                                                    } else {
                                                       //file
                                                       modelCDMFile* elementFile = dynamic_cast<modelCDMFile*>(element);
                                                       if(elementFile != NULL)
@@ -1098,12 +1151,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                               wxT("Description Panel"),
                                                               wxDefaultPosition,
                                                               wxSize(600, 400),
-                                                              0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                                           );
-                                                        }
-                                                      else
-                                                        {
-
+                                                        } else {
                                                           //main if not any
                                                           //create element description
                                                           description = new wxCDMMainDescriptionPanel(
@@ -1112,7 +1167,12 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                               wxT("Description Panel"),
                                                               wxDefaultPosition,
                                                               wxSize(600, 400),
-                                                              0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
                                                           );
                                                         }
                                                     }
@@ -1141,9 +1201,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
       this->panel_Properties = description;
 
       auiManager.Update();
-    }
-  else
-    {
+    } else {
       event.Skip();
 	}
 
@@ -1178,7 +1236,12 @@ void wxCDMMainFrame::OnChangeView(wxCommandEvent& event)
             wxT("Description Panel"),
             wxDefaultPosition,
             wxSize(600, 400),
-            0
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
         );
       }
     else if(event.GetString() == wxT("manage_libraries"))