X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainFrame.cpp;h=ab6e16af43d0418e790435f5e525035e3f9e9f10;hb=1c3bc8de4d0e9b492f95c5d8c468881a80f420da;hp=6ef4155e2243cd2615bb1ceac5385b89985559e7;hpb=e992e2085f2a767ab390c3168599047de2ef1d3b;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 6ef4155..ab6e16a 100755
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -51,6 +51,8 @@
 #include "wxCDMLibraryDescriptionPanel.h"
 #include "wxCDMPackageDescriptionPanel.h"
 #include "wxCDMBlackBoxDescriptionPanel.h"
+#include "wxCDMBBSFileDescriptionPanel.h"
+#include "wxCDMBBGFileDescriptionPanel.h"
 #include "wxCDMCodeFileDescriptionPanel.h"
 #include "wxCDMCMakeListsDescriptionPanel.h"
 #include "wxCDMFolderDescriptionPanel.h"
@@ -269,14 +271,25 @@ void wxCDMMainFrame::CreateControls()
   auiManager.SetManagedWindow(this);
 
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
   tree_Projects = new wxCDMProjectsTreeCtrl(
       this,
       ID_TREE_PROJECTS,
       wxDefaultPosition,
       wxSize(200,400),
-	  wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS
-  );
+      wxTR_HAS_BUTTONS | wxTR_AQUA_BUTTONS );
+  this->actualTreeItem.Unset();
+#else
+  tree_Projects = new wxCDMProjectsTreeCtrl(
+      this,
+      ID_TREE_PROJECTS,
+      wxDefaultPosition,
+      wxSize(200,400),
+      wxTR_HAS_BUTTONS  );
   this->actualTreeItem.Unset();
+#endif
+
 
   panel_Properties = new wxCDMMainDescriptionPanel(
       this,
@@ -410,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));
@@ -512,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));
 
@@ -604,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));
 
@@ -879,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)
@@ -897,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)
@@ -915,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)
@@ -932,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)
@@ -949,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)
@@ -965,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)
@@ -983,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)
@@ -1000,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)
@@ -1017,56 +1071,111 @@ 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
-                                        {
-                                          //folder
-                                          modelCDMFolder* elementFolder = dynamic_cast<modelCDMFolder*>(element);
-                                          if(elementFolder != NULL)
+                                        } else {
+                                          //BBSFile
+                                          modelCDMBBSFile* elementBBSFile = dynamic_cast<modelCDMBBSFile*>(element);
+                                          if(elementBBSFile != NULL)
                                             {
                                               //create element description
-                                              description = new wxCDMFolderDescriptionPanel(
+                                              description = new wxCDMBBSFileDescriptionPanel(
                                                   this,
-                                                  elementFolder,
+                                                  elementBBSFile,
                                                   ID_WINDOW_PROPERTIES,
                                                   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
-                                            {
-                                              //file
-                                              modelCDMFile* elementFile = dynamic_cast<modelCDMFile*>(element);
-                                              if(elementFile != NULL)
-                                                {
-                                                  //create element description
-                                                  description = new wxCDMFileDescriptionPanel(
-                                                      this,
-                                                      elementFile,
-                                                      ID_WINDOW_PROPERTIES,
-                                                      wxT("Description Panel"),
-                                                      wxDefaultPosition,
-                                                      wxSize(600, 400),
-                                                      0
-                                                  );
-                                                }
-                                              else
+                                            } else {
+                                              //BBSFile
+                                              modelCDMBBGFile* elementBBGFile = dynamic_cast<modelCDMBBGFile*>(element);
+                                              if(elementBBGFile != NULL)
                                                 {
-
-                                                  //main if not any
                                                   //create element description
-                                                  description = new wxCDMMainDescriptionPanel(
+                                                  description = new wxCDMBBGFileDescriptionPanel(
                                                       this,
+                                                      elementBBGFile,
                                                       ID_WINDOW_PROPERTIES,
                                                       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 {
+                                                  //folder
+                                                  modelCDMFolder* elementFolder = dynamic_cast<modelCDMFolder*>(element);
+                                                  if(elementFolder != NULL)
+                                                    {
+                                                      //create element description
+                                                      description = new wxCDMFolderDescriptionPanel(
+                                                          this,
+                                                          elementFolder,
+                                                          ID_WINDOW_PROPERTIES,
+                                                          wxT("Description Panel"),
+                                                          wxDefaultPosition,
+                                                          wxSize(600, 400),
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
+                                                      );
+                                                    } else {
+                                                      //file
+                                                      modelCDMFile* elementFile = dynamic_cast<modelCDMFile*>(element);
+                                                      if(elementFile != NULL)
+                                                        {
+                                                          //create element description
+                                                          description = new wxCDMFileDescriptionPanel(
+                                                              this,
+                                                              elementFile,
+                                                              ID_WINDOW_PROPERTIES,
+                                                              wxT("Description Panel"),
+                                                              wxDefaultPosition,
+                                                              wxSize(600, 400),
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
+                                                          );
+                                                        } else {
+                                                          //main if not any
+                                                          //create element description
+                                                          description = new wxCDMMainDescriptionPanel(
+                                                              this,
+                                                              ID_WINDOW_PROPERTIES,
+                                                              wxT("Description Panel"),
+                                                              wxDefaultPosition,
+                                                              wxSize(600, 400),
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+										0
+#else
+									wxSHOW_SB_ALWAYS | wxVSCROLL
+#endif
+                                                          );
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
@@ -1092,9 +1201,7 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
       this->panel_Properties = description;
 
       auiManager.Update();
-    }
-  else
-    {
+    } else {
       event.Skip();
 	}
 
@@ -1129,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"))