Regenerated the UI code to avoid resource version number issue

lssssj · Jul 26, 2015 · e634eb7 · e634eb7
1 parent 49c8496
commit e634eb7
Show file tree

Hide file tree

Showing 114 changed files with 11,451 additions and 10,152 deletions.
diff --git a/CMakePlugin/CMakePlugin.wxcp b/CMakePlugin/CMakePlugin.wxcp
@@ -71,6 +71,10 @@
      "type": "string",
      "m_label": "Style:",
      "m_value": ""
+    }, {
+     "type": "bool",
+     "m_label": "Enable Window Persistency:",
+     "m_value": true
     }, {
      "type": "string",
      "m_label": "Title:",
@@ -127,6 +131,10 @@
      "m_styles": [],
      "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
      "m_properties": [{
+       "type": "string",
+       "m_label": "Minimum Size:",
+       "m_value": "-1,-1"
+      }, {
        "type": "string",
        "m_label": "Name:",
        "m_value": "boxSizerMain"
@@ -150,6 +158,10 @@
        "m_styles": [],
        "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
        "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
          "type": "string",
          "m_label": "Name:",
          "m_value": "flexGridSizer"
@@ -709,6 +721,10 @@
      "m_styles": [],
      "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
      "m_properties": [{
+       "type": "string",
+       "m_label": "Minimum Size:",
+       "m_value": "-1,-1"
+      }, {
        "type": "string",
        "m_label": "Name:",
        "m_value": "boxSizerMain"
@@ -732,6 +748,10 @@
        "m_styles": [],
        "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
        "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
          "type": "string",
          "m_label": "Name:",
          "m_value": "flexGridSizer225"
@@ -1306,6 +1326,10 @@
        "m_styles": [],
        "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
        "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
          "type": "string",
          "m_label": "Name:",
          "m_value": "boxSizerList"
@@ -1622,6 +1646,10 @@
      "m_styles": [],
      "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
      "m_properties": [{
+       "type": "string",
+       "m_label": "Minimum Size:",
+       "m_value": "-1,-1"
+      }, {
        "type": "string",
        "m_label": "Name:",
        "m_value": "boxSizer"
@@ -1720,6 +1748,10 @@
        "m_styles": [],
        "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
        "m_properties": [{
+         "type": "string",
+         "m_label": "Minimum Size:",
+         "m_value": "-1,-1"
+        }, {
          "type": "string",
          "m_label": "Name:",
          "m_value": "flexGridSizer"

diff --git a/CMakePlugin/CMakePluginUi.cpp b/CMakePlugin/CMakePluginUi.cpp
@@ -65,12 +65,20 @@ CMakeSettingsDialogBase::CMakeSettingsDialogBase(wxWindow* parent, wxWindowID id
     m_stdBtnSizer->AddButton(m_buttonCancel);
     m_stdBtnSizer->Realize();
 
+    SetName(wxT("CMakeSettingsDialogBase"));
     SetMinSize( wxSize(400,150) );
     SetSizeHints(-1,-1);
     if ( GetSizer() ) {
          GetSizer()->Fit(this);
     }
-    Centre(wxBOTH);
+    CentreOnParent(wxBOTH);
+#if wxVERSION_NUMBER >= 2900
+    if(!wxPersistenceManager::Get().Find(this)) {
+        wxPersistenceManager::Get().RegisterAndRestore(this);
+    } else {
+        wxPersistenceManager::Get().Restore(this);
+    }
+#endif
 }
 
 CMakeSettingsDialogBase::~CMakeSettingsDialogBase()
@@ -154,11 +162,12 @@ CMakeHelpTabBase::CMakeHelpTabBase(wxWindow* parent, wxWindowID id, const wxPoin
     boxSizerList->Add(m_listBoxList, 1, wxALL|wxEXPAND, 0);
     m_listBoxList->SetMinSize(wxSize(100,200));
 
+    SetName(wxT("CMakeHelpTabBase"));
     SetSizeHints(-1,-1);
     if ( GetSizer() ) {
          GetSizer()->Fit(this);
     }
-    Centre(wxBOTH);
+    CentreOnParent(wxBOTH);
     // Connect events
     m_staticTextVersion->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
     m_staticTextVersionValue->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeHelpTabBase::OnUpdateUi), NULL, this);
@@ -286,12 +295,13 @@ CMakeProjectSettingsPanelBase::CMakeProjectSettingsPanelBase(wxWindow* parent, w
 
     boxSizer->Add(m_textCtrlArguments, 1, wxALL|wxEXPAND, 5);
 
+    SetName(wxT("CMakeProjectSettingsPanelBase"));
     SetMinSize( wxSize(400,300) );
     SetSizeHints(400,300);
     if ( GetSizer() ) {
          GetSizer()->Fit(this);
     }
-    Centre(wxBOTH);
+    CentreOnParent(wxBOTH);
     // Connect events
     m_staticTextParent->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeProjectSettingsPanelBase::OnCheck), NULL, this);
     m_choiceParent->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(CMakeProjectSettingsPanelBase::OnCheck), NULL, this);

diff --git a/CMakePlugin/CMakePluginUi.h b/CMakePlugin/CMakePluginUi.h
@@ -4,8 +4,8 @@
 // Do not modify this file by hand!
 //////////////////////////////////////////////////////////////////////
 
-#ifndef CMAKEPLUGIN_BASE_CLASSES_H
-#define CMAKEPLUGIN_BASE_CLASSES_H
+#ifndef CODELITE_CMAKEPLUGIN_CMAKEPLUGIN_BASE_CLASSES_H
+#define CODELITE_CMAKEPLUGIN_CMAKEPLUGIN_BASE_CLASSES_H
 
 #include <wx/settings.h>
 #include <wx/xrc/xmlres.h>
@@ -30,6 +30,12 @@
 #include <wx/bitmap.h>
 #include <map>
 #include <wx/icon.h>
+#if wxVERSION_NUMBER >= 2900
+#include <wx/persist.h>
+#include <wx/persist/toplevel.h>
+#include <wx/persist/bookctrl.h>
+#include <wx/persist/treebook.h>
+#endif
 
 class CMakeSettingsDialogBase : public wxDialog
 {

diff --git a/CodeFormatter/codeformatterdlgbase.cpp b/CodeFormatter/codeformatterdlgbase.cpp
@@ -25,7 +25,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
         bBitmapLoaded = true;
     }
 
-    bSizerMain = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* bSizerMain = new wxBoxSizer(wxVERTICAL);
     this->SetSizer(bSizerMain);
 
     m_treebook = new wxTreebook(this, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxBK_DEFAULT);
@@ -36,10 +36,10 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_panel133 = new wxPanel(m_treebook, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_treebook->AddPage(m_panel133, _("General"), true, wxNOT_FOUND);
 
-    boxSizer179 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer179 = new wxBoxSizer(wxVERTICAL);
     m_panel133->SetSizer(boxSizer179);
 
-    flexGridSizer158 = new wxFlexGridSizer(0, 2, 0, 0);
+    wxFlexGridSizer* flexGridSizer158 = new wxFlexGridSizer(0, 2, 0, 0);
     flexGridSizer158->SetFlexibleDirection( wxBOTH );
     flexGridSizer158->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
     flexGridSizer158->AddGrowableCol(1);
@@ -85,7 +85,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_panelAstyle = new wxPanel(m_treebook, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_treebook->InsertSubPage(1, m_panelAstyle, _("AStyle"), false, wxNOT_FOUND);
 
-    boxSizer95 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer95 = new wxBoxSizer(wxVERTICAL);
     m_panelAstyle->SetSizer(boxSizer95);
 
     m_splitter145 = new wxSplitterWindow(m_panelAstyle, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE);
@@ -96,7 +96,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
 
     m_splitterPage149 = new wxPanel(m_splitter145, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
 
-    boxSizer155 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer155 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage149->SetSizer(boxSizer155);
 
     wxArrayString m_pgMgrAstyleArr;
@@ -182,11 +182,11 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_pgPropFormatting = m_pgMgrAstyle->AppendIn( m_pgPropAstyleOptions,  new wxFlagsProperty( _("Formatting"), wxPG_LABEL, m_pgMgrAstyleArr, m_pgMgrAstyleIntArr, 0) );
     m_pgPropFormatting->SetHelpString(_("Select one or more formatting option from the list below"));
 
-    bCustomSettingsSizer = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* bCustomSettingsSizer = new wxBoxSizer(wxVERTICAL);
 
     boxSizer155->Add(bCustomSettingsSizer, 0, wxALL|wxEXPAND, 2);
 
-    boxSizer57 = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer* boxSizer57 = new wxBoxSizer(wxHORIZONTAL);
 
     bCustomSettingsSizer->Add(boxSizer57, 0, wxEXPAND, 5);
 
@@ -210,7 +210,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_splitterPage153 = new wxPanel(m_splitter145, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_splitter145->SplitVertically(m_splitterPage149, m_splitterPage153, 0);
 
-    boxSizer157 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer157 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage153->SetSizer(boxSizer157);
 
     m_textCtrlPreview = new wxStyledTextCtrl(m_splitterPage153, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
@@ -254,7 +254,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_panelClang = new wxPanel(m_treebook, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_treebook->InsertSubPage(1, m_panelClang, _("clang-format"), false, wxNOT_FOUND);
 
-    boxSizer97 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer97 = new wxBoxSizer(wxVERTICAL);
     m_panelClang->SetSizer(boxSizer97);
 
     m_splitter165 = new wxSplitterWindow(m_panelClang, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE);
@@ -265,7 +265,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
 
     m_splitterPage169 = new wxPanel(m_splitter165, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
 
-    boxSizer175 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer175 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage169->SetSizer(boxSizer175);
 
     wxArrayString m_pgMgrClangArr;
@@ -364,7 +364,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_splitterPage173 = new wxPanel(m_splitter165, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_splitter165->SplitVertically(m_splitterPage169, m_splitterPage173, 0);
 
-    boxSizer177 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer177 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage173->SetSizer(boxSizer177);
 
     m_textCtrlPreview_Clang = new wxStyledTextCtrl(m_splitterPage173, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
@@ -411,7 +411,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_panelBuiltIn = new wxPanel(m_treebook, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_treebook->InsertSubPage(4, m_panelBuiltIn, _("Builtin"), false, wxNOT_FOUND);
 
-    boxSizer99 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer99 = new wxBoxSizer(wxVERTICAL);
     m_panelBuiltIn->SetSizer(boxSizer99);
 
     m_splitter119 = new wxSplitterWindow(m_panelBuiltIn, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxSP_LIVE_UPDATE);
@@ -422,7 +422,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
 
     m_splitterPage123 = new wxPanel(m_splitter119, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
 
-    boxSizer129 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer129 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage123->SetSizer(boxSizer129);
 
     wxArrayString m_pgMgrPhpArr;
@@ -460,7 +460,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_splitterPage127 = new wxPanel(m_splitter119, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_splitter119->SplitVertically(m_splitterPage123, m_splitterPage127, 0);
 
-    boxSizer131 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer131 = new wxBoxSizer(wxVERTICAL);
     m_splitterPage127->SetSizer(boxSizer131);
 
     m_stcPhpPreview = new wxStyledTextCtrl(m_splitterPage127, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), 0);
@@ -504,10 +504,10 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
     m_panel185 = new wxPanel(m_treebook, wxID_ANY, wxDefaultPosition, wxSize(-1,-1), wxTAB_TRAVERSAL);
     m_treebook->InsertSubPage(4, m_panel185, _("PHP-CS-Fixer"), false, wxNOT_FOUND);
 
-    boxSizer209 = new wxBoxSizer(wxVERTICAL);
+    wxBoxSizer* boxSizer209 = new wxBoxSizer(wxVERTICAL);
     m_panel185->SetSizer(boxSizer209);
 
-    flexGridSizer190 = new wxFlexGridSizer(0, 2, 0, 0);
+    wxFlexGridSizer* flexGridSizer190 = new wxFlexGridSizer(0, 2, 0, 0);
     flexGridSizer190->SetFlexibleDirection( wxBOTH );
     flexGridSizer190->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
     flexGridSizer190->AddGrowableCol(1);
@@ -615,7 +615,7 @@ CodeFormatterBaseDlg::CodeFormatterBaseDlg(wxWindow* parent, wxWindowID id, cons
 
     boxSizer209->Add(m_stcFixerPreview, 1, wxALL|wxEXPAND, 5);
 
-    bSizerButtons = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer* bSizerButtons = new wxBoxSizer(wxHORIZONTAL);
 
     bSizerMain->Add(bSizerButtons, 0, wxALIGN_CENTER_HORIZONTAL, 5);
 

diff --git a/CodeFormatter/codeformatterdlgbase.h b/CodeFormatter/codeformatterdlgbase.h
@@ -41,41 +41,31 @@
 class CodeFormatterBaseDlg : public wxDialog
 {
 protected:
-    wxBoxSizer* bSizerMain;
     wxTreebook* m_treebook;
     wxPanel* m_panel133;
-    wxBoxSizer* boxSizer179;
-    wxFlexGridSizer* flexGridSizer158;
     wxCheckBox* m_checkBoxFormatOnSave;
     wxStaticText* m_staticText115;
     wxChoice* m_choiceCxxEngine;
     wxStaticText* m_staticText198;
     wxChoice* m_choicePhpFormatter;
     wxPanel* m_panelCxx;
     wxPanel* m_panelAstyle;
-    wxBoxSizer* boxSizer95;
     wxSplitterWindow* m_splitter145;
     wxPanel* m_splitterPage149;
-    wxBoxSizer* boxSizer155;
     wxPropertyGridManager* m_pgMgrAstyle;
     wxPGProperty* m_pgPropAstyleOptions;
     wxPGProperty* m_pgPropPreDefinedStyles;
     wxPGProperty* m_pgPropBrackets;
     wxPGProperty* m_pgPropIndentation;
     wxPGProperty* m_pgPropFormatting;
-    wxBoxSizer* bCustomSettingsSizer;
-    wxBoxSizer* boxSizer57;
     wxStaticText* m_staticText59;
     wxStaticText* m_staticText3;
     wxTextCtrl* m_textCtrlUserFlags;
     wxPanel* m_splitterPage153;
-    wxBoxSizer* boxSizer157;
     wxStyledTextCtrl* m_textCtrlPreview;
     wxPanel* m_panelClang;
-    wxBoxSizer* boxSizer97;
     wxSplitterWindow* m_splitter165;
     wxPanel* m_splitterPage169;
-    wxBoxSizer* boxSizer175;
     wxPropertyGridManager* m_pgMgrClang;
     wxPGProperty* m_pgPropClangFormat;
     wxPGProperty* m_pgPropClangFormatExePath;
@@ -84,31 +74,24 @@ class CodeFormatterBaseDlg : public wxDialog
     wxPGProperty* m_pgPropClangFormatStyle;
     wxPGProperty* m_pgPropClangFormattingOptions;
     wxPanel* m_splitterPage173;
-    wxBoxSizer* boxSizer177;
     wxStyledTextCtrl* m_textCtrlPreview_Clang;
     wxPanel* m_panelPHP;
     wxPanel* m_panelBuiltIn;
-    wxBoxSizer* boxSizer99;
     wxSplitterWindow* m_splitter119;
     wxPanel* m_splitterPage123;
-    wxBoxSizer* boxSizer129;
     wxPropertyGridManager* m_pgMgrPhp;
     wxPGProperty* m_pgPropPhpFormatter;
     wxPGProperty* m_pgPropPhpFormatterOptions;
     wxPanel* m_splitterPage127;
-    wxBoxSizer* boxSizer131;
     wxStyledTextCtrl* m_stcPhpPreview;
     wxPanel* m_panel185;
-    wxBoxSizer* boxSizer209;
-    wxFlexGridSizer* flexGridSizer190;
     wxStaticText* m_staticText192;
     wxFilePickerCtrl* m_filePickerPhpExec;
     wxStaticText* m_staticText202;
     wxFilePickerCtrl* m_filePickerPHPCsFixerPhar;
     wxStaticText* m_staticText217;
     wxStyledTextCtrl* m_stc;
     wxStyledTextCtrl* m_stcFixerPreview;
-    wxBoxSizer* bSizerButtons;
     wxStdDialogButtonSizer* m_stdBtnSizer30;
     wxButton* m_buttonOK;
     wxButton* m_buttonApply;