Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[crea.git] / lib / creaDevManagerLib / wxCDMMainFrame.cpp

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index e8d28c522ca75ef4c83c79f96b1cfca297dc5da6..5664c50d3aed65200f0afae5de487d376870d5bc 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMMainFrame.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
@@ -52,6 +52,7 @@
 #include "wxCDMPackageDescriptionPanel.h"
 #include "wxCDMBlackBoxDescriptionPanel.h"
 #include "wxCDMBBSFileDescriptionPanel.h"
+#include "wxCDMBBGFileDescriptionPanel.h"
 #include "wxCDMCodeFileDescriptionPanel.h"
 #include "wxCDMCMakeListsDescriptionPanel.h"
 #include "wxCDMFolderDescriptionPanel.h"
@@ -270,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,
@@ -1040,14 +1052,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                             }
                                           else
                                             {
-                                              //folder
-                                              modelCDMFolder* elementFolder = dynamic_cast<modelCDMFolder*>(element);
-                                              if(elementFolder != NULL)
+                                              //BBSFile
+                                              modelCDMBBGFile* elementBBGFile = dynamic_cast<modelCDMBBGFile*>(element);
+                                              if(elementBBGFile != NULL)
                                                 {
                                                   //create element description
-                                                  description = new wxCDMFolderDescriptionPanel(
+                                                  description = new wxCDMBBGFileDescriptionPanel(
                                                       this,
-                                                      elementFolder,
+                                                      elementBBGFile,
                                                       ID_WINDOW_PROPERTIES,
                                                       wxT("Description Panel"),
                                                       wxDefaultPosition,
@@ -1057,14 +1069,14 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                 }
                                               else
                                                 {
-                                                  //file
-                                                  modelCDMFile* elementFile = dynamic_cast<modelCDMFile*>(element);
-                                                  if(elementFile != NULL)
+                                                  //folder
+                                                  modelCDMFolder* elementFolder = dynamic_cast<modelCDMFolder*>(element);
+                                                  if(elementFolder != NULL)
                                                     {
                                                       //create element description
-                                                      description = new wxCDMFileDescriptionPanel(
+                                                      description = new wxCDMFolderDescriptionPanel(
                                                           this,
-                                                          elementFile,
+                                                          elementFolder,
                                                           ID_WINDOW_PROPERTIES,
                                                           wxT("Description Panel"),
                                                           wxDefaultPosition,
@@ -1074,17 +1086,35 @@ void wxCDMMainFrame::OnTreeSelectionChanged(wxTreeEvent& event)
                                                     }
                                                   else
                                                     {
-
-                                                      //main if not any
-                                                      //create element description
-                                                      description = new wxCDMMainDescriptionPanel(
-                                                          this,
-                                                          ID_WINDOW_PROPERTIES,
-                                                          wxT("Description Panel"),
-                                                          wxDefaultPosition,
-                                                          wxSize(600, 400),
-                                                          0
-                                                      );
+                                                      //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
+                                                        {
+
+                                                          //main if not any
+                                                          //create element description
+                                                          description = new wxCDMMainDescriptionPanel(
+                                                              this,
+                                                              ID_WINDOW_PROPERTIES,
+                                                              wxT("Description Panel"),
+                                                              wxDefaultPosition,
+                                                              wxSize(600, 400),
+                                                              0
+                                                          );
+                                                        }
                                                     }
                                                 }
                                             }