#3136 creaFeature New Normal - branch vtk7itk4wx3

diff --git a/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp
index 723f229335a382655594f13587d738edaf88dc24..4bd8f14d31a7ac0fa5ce7469c9b7253d5d23b4b4 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp
@@ -80,7 +80,15 @@ bool wxCDMCodeFileDescriptionPanel::Create(
   CreateControls();
   // this part makes the scrollbars show up
   this->FitInside(); // ask the sizer about the needed size
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
   this->SetScrollRate(5, 5);
+#else
+       printf ("EED wxCDMPackageDescriptionPanel::Create    Change 05\n");
+  //...
+#endif
+
   return TRUE;
 }
 

diff --git a/lib/creaDevManagerLib/wxCDMMainFrame.cpp b/lib/creaDevManagerLib/wxCDMMainFrame.cpp
index 5664c50d3aed65200f0afae5de487d376870d5bc..ab6e16af43d0418e790435f5e525035e3f9e9f10 100755 (executable)
--- 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"))

diff --git a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
index d7a28be83fcd02f4e64d4289fc6c4b9ddf67fa99..6546871cdebf0d901a2fd65f2066e1f93e1e2e1b 100644 (file)
--- a/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageManagerPanel.cpp
@@ -43,13 +43,13 @@
 #include "images/PkIcon64.xpm"
 
 BEGIN_EVENT_TABLE(wxCDMPackageManagerPanel, wxPanel)
-EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMPackageManagerPanel::OnBtnReturn)
-EVT_HYPERLINK(ID_LINK_SELECT_PACKAGE, wxCDMPackageManagerPanel::OnLnkPackageSelect)
-EVT_BUTTON(ID_BUTTON_CREATE_PACKAGE, wxCDMPackageManagerPanel::OnBtnCreatePackage)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCDMPackageManagerPanel::OnBtnCreatePackage)
-EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMPackageManagerPanel::OnBtnEditCMakeLists)
-EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_TOOL_ENTER, wxCDMPackageManagerPanel::OnBtnEditCMakeLists)
-EVT_CHECKBOX(ID_CHECK_INCLUDE_PACKAGE, wxCDMPackageManagerPanel::OnChBPackageChange)
+  EVT_HYPERLINK(ID_BUTTON_PREV, wxCDMPackageManagerPanel::OnBtnReturn)
+  EVT_HYPERLINK(ID_LINK_SELECT_PACKAGE, wxCDMPackageManagerPanel::OnLnkPackageSelect)
+  EVT_BUTTON(ID_BUTTON_CREATE_PACKAGE, wxCDMPackageManagerPanel::OnBtnCreatePackage)
+  EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCDMPackageManagerPanel::OnBtnCreatePackage)
+  EVT_BUTTON(ID_BUTTON_EDIT_CMAKELISTSFILE, wxCDMPackageManagerPanel::OnBtnEditCMakeLists)
+  EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_TOOL_ENTER, wxCDMPackageManagerPanel::OnBtnEditCMakeLists)
+  EVT_CHECKBOX(ID_CHECK_INCLUDE_PACKAGE, wxCDMPackageManagerPanel::OnChBPackageChange)
 END_EVENT_TABLE()
 
 wxCDMPackageManagerPanel::wxCDMPackageManagerPanel(

diff --git a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
index 514d247faf7c32e3728ec5b640a5a4b5f8662232..7eac414690ae114d58ee2da5c9e4f85d0b1d7984 100755 (executable)
--- a/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMProjectActionsPanel.cpp
@@ -81,7 +81,6 @@ bool wxCDMProjectActionsPanel::Create(
   // this part makes the scrollbars show up
   this->FitInside(); // ask the sizer about the needed size
   this->SetScrollRate(5, 5);
-
   return TRUE;
 }