From 467a79557211bf3735c87284bb320b9a9bd62436 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 23 Nov 2017 17:35:11 +0100 Subject: [PATCH] #3136 creaFeature New Normal - branch vtk7itk4wx3 --- .../wxCDMCodeFileDescriptionPanel.cpp | 8 + lib/creaDevManagerLib/wxCDMMainFrame.cpp | 187 ++++++++++++------ .../wxCDMPackageManagerPanel.cpp | 14 +- .../wxCDMProjectActionsPanel.cpp | 1 - 4 files changed, 140 insertions(+), 70 deletions(-) diff --git a/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMCodeFileDescriptionPanel.cpp index 723f229..4bd8f14 100644 --- 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 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(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(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(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(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(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(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(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(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(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(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(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(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 d7a28be..6546871 100644 --- 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 514d247..7eac414 100755 --- 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; } -- 2.45.1