Skip to content

Commit

Permalink
Fix another tranch of wx3.1 sizer asserts
Browse files Browse the repository at this point in the history
  • Loading branch information
dghart committed May 14, 2015
1 parent b4ae5ad commit 2c376c2
Show file tree
Hide file tree
Showing 16 changed files with 2,119 additions and 1,995 deletions.
4 changes: 2 additions & 2 deletions Gizmos/newclassbasedlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ NewClassBaseDlg::NewClassBaseDlg(wxWindow* parent, wxWindowID id, const wxString
m_staticText8Font.SetWeight(wxFONTWEIGHT_BOLD);
m_staticText8->SetFont(m_staticText8Font);

bSizer8->Add(m_staticText8, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
bSizer8->Add(m_staticText8, 0, wxALL, 5);

m_checkBoxInline = new wxCheckBox(this, wxID_ANY, _("Inline class"), wxDefaultPosition, wxSize(-1, -1), 0);
m_checkBoxInline->SetValue(false);
Expand Down Expand Up @@ -164,7 +164,7 @@ NewClassBaseDlg::NewClassBaseDlg(wxWindow* parent, wxWindowID id, const wxString

m_staticText7 = new wxStaticText(m_collPane2->GetPane(), wxID_ANY, _("Inherits:"), wxDefaultPosition, wxSize(-1, -1), 0);

boxSizer6->Add(m_staticText7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
boxSizer6->Add(m_staticText7, 0, wxALL, 5);

wxBoxSizer* bSizer15 = new wxBoxSizer(wxHORIZONTAL);

Expand Down
4 changes: 2 additions & 2 deletions Gizmos/newclasswizard.wxcp
Original file line number Diff line number Diff line change
Expand Up @@ -1502,7 +1502,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
Expand Down Expand Up @@ -1937,7 +1937,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
Expand Down
94 changes: 47 additions & 47 deletions Gizmos/newclasswizard_gizmos_bitmaps.cpp
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
//
// This file was automatically generated by wxrc, do not edit by hand.
//

#include <wx/wxprec.h>

#ifdef __BORLANDC__
#pragma hdrstop
#endif

#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_all.h>

#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
#else
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFile(name, data, size)
#endif

static size_t xml_res_size_0 = 90;
static unsigned char xml_res_file_0[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
47,119,120,120,114,99,34,47,62,10};

void wxC3999InitBitmapResources()
{

// Check for memory FS. If not present, load the handler:
{
wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
wxFileSystem fsys;
wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
if (f) delete f;
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}

XRC_ADD_FILE(wxT("XRC_resource/newclasswizard_gizmos_bitmaps.cpp$C__src_codelite_Gizmos_newclasswizard_gizmos_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/newclasswizard_gizmos_bitmaps.cpp$C__src_codelite_Gizmos_newclasswizard_gizmos_bitmaps.xrc"));
}
//
// This file was automatically generated by wxrc, do not edit by hand.
//

#include <wx/wxprec.h>

#ifdef __BORLANDC__
#pragma hdrstop
#endif

#include <wx/filesys.h>
#include <wx/fs_mem.h>
#include <wx/xrc/xmlres.h>
#include <wx/xrc/xh_all.h>

#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
#else
#define XRC_ADD_FILE(name, data, size, mime) \
wxMemoryFSHandler::AddFile(name, data, size)
#endif

static size_t xml_res_size_0 = 90;
static unsigned char xml_res_file_0[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58,
47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103,
47,119,120,120,114,99,34,47,62,10};

void wxC3999InitBitmapResources()
{

// Check for memory FS. If not present, load the handler:
{
wxMemoryFSHandler::AddFile(wxT("XRC_resource/dummy_file"), wxT("dummy one"));
wxFileSystem fsys;
wxFSFile *f = fsys.OpenFile(wxT("memory:XRC_resource/dummy_file"));
wxMemoryFSHandler::RemoveFile(wxT("XRC_resource/dummy_file"));
if (f) delete f;
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}

XRC_ADD_FILE(wxT("XRC_resource/newclasswizard_gizmos_bitmaps.cpp$_home_david_devel_git_CL_Gizmos_newclasswizard_gizmos_bitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/newclasswizard_gizmos_bitmaps.cpp$_home_david_devel_git_CL_Gizmos_newclasswizard_gizmos_bitmaps.xrc"));
}
24 changes: 20 additions & 4 deletions SpellChecker/wxcrafter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ SpellCheckerSettings_base::SpellCheckerSettings_base(wxWindow* parent, wxWindowI

m_staticText2 = new wxStaticText(this, wxID_ANY, _("Dictionary path:"), wxDefaultPosition, wxSize(-1, -1), 0);

bSizer51->Add(m_staticText2, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
bSizer51->Add(m_staticText2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);

m_pDirPicker = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, wxT("Select a folder"), wxDefaultPosition, wxSize(-1, -1), wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL);
m_pDirPicker = new wxDirPickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxSize(-1, -1), wxDIRP_DEFAULT_STYLE|wxDIRP_USE_TEXTCTRL);
m_pDirPicker->SetToolTip(_("Select the location of the installed dictionaries"));

bSizer51->Add(m_pDirPicker, 1, wxALL, 2);
Expand Down Expand Up @@ -120,11 +120,19 @@ SpellCheckerSettings_base::SpellCheckerSettings_base(wxWindow* parent, wxWindowI
m_stdBtnSizer12->AddButton(m_buttonCancel);
m_stdBtnSizer12->Realize();

SetName(wxT("SpellCheckerSettings_base"));
SetSizeHints(-1,-1);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
Centre();
CentreOnParent();
#if wxVERSION_NUMBER >= 2900
if(!wxPersistenceManager::Get().Find(this)) {
wxPersistenceManager::Get().RegisterAndRestore(this);
} else {
wxPersistenceManager::Get().Restore(this);
}
#endif
// Connect events
this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(SpellCheckerSettings_base::OnInitDialog), NULL, this);
m_pDirPicker->Connect(wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler(SpellCheckerSettings_base::OnDirChanged), NULL, this);
Expand Down Expand Up @@ -223,11 +231,19 @@ CorrectSpellingDlg_base::CorrectSpellingDlg_base(wxWindow* parent, wxWindowID id

bSizer12->Add(m_button3, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5);

SetName(wxT("CorrectSpellingDlg_base"));
SetSizeHints(-1,-1);
if ( GetSizer() ) {
GetSizer()->Fit(this);
}
Centre();
CentreOnParent();
#if wxVERSION_NUMBER >= 2900
if(!wxPersistenceManager::Get().Find(this)) {
wxPersistenceManager::Get().RegisterAndRestore(this);
} else {
wxPersistenceManager::Get().Restore(this);
}
#endif
// Connect events
this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(CorrectSpellingDlg_base::OnInitDialog), NULL, this);
m_pSuggestions->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler(CorrectSpellingDlg_base::OnSuggestionSelected), NULL, this);
Expand Down
27 changes: 27 additions & 0 deletions SpellChecker/wxcrafter.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,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 SpellCheckerSettings_base : public wxDialog
{
Expand Down Expand Up @@ -55,6 +61,18 @@ class SpellCheckerSettings_base : public wxDialog
virtual void OnUpdateOk(wxUpdateUIEvent& event) { event.Skip(); }

public:
wxStaticText* GetStaticText2() { return m_staticText2; }
wxDirPickerCtrl* GetPDirPicker() { return m_pDirPicker; }
wxHyperlinkCtrl* GetPHyperlink() { return m_pHyperlink; }
wxStaticText* GetStaticText4() { return m_staticText4; }
wxTextCtrl* GetPCurrentLanguage() { return m_pCurrentLanguage; }
wxListBox* GetPLanguageList() { return m_pLanguageList; }
wxCheckBox* GetPStrings() { return m_pStrings; }
wxCheckBox* GetPCppComments() { return m_pCppComments; }
wxCheckBox* GetPC_Comments() { return m_pC_Comments; }
wxCheckBox* GetPDox1() { return m_pDox1; }
wxCheckBox* GetPDox2() { return m_pDox2; }
wxButton* GetButtonClearIgnoreList() { return m_buttonClearIgnoreList; }
SpellCheckerSettings_base(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("SpellChecker Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1, -1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~SpellCheckerSettings_base();
};
Expand Down Expand Up @@ -83,6 +101,15 @@ class CorrectSpellingDlg_base : public wxDialog
virtual void OnSuggestClick(wxCommandEvent& event) { event.Skip(); }

public:
wxStaticText* GetStaticText1() { return m_staticText1; }
wxTextCtrl* GetPMisspelling() { return m_pMisspelling; }
wxStaticText* GetStaticText2() { return m_staticText2; }
wxListBox* GetPSuggestions() { return m_pSuggestions; }
wxButton* GetButton1() { return m_button1; }
wxButton* GetButton2() { return m_button2; }
wxButton* GetButton4() { return m_button4; }
wxButton* GetButton5() { return m_button5; }
wxButton* GetButton3() { return m_button3; }
CorrectSpellingDlg_base(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Misspelling found!"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
virtual ~CorrectSpellingDlg_base();
};
Expand Down
58 changes: 57 additions & 1 deletion SpellChecker/wxcrafter.wxcp
Original file line number Diff line number Diff line change
Expand Up @@ -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:",
Expand Down Expand Up @@ -134,6 +138,10 @@
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer5"
Expand All @@ -157,6 +165,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer51"
Expand All @@ -178,7 +190,7 @@
"gbSpan": ",",
"gbPosition": ",",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
Expand Down Expand Up @@ -425,6 +437,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer6"
Expand All @@ -448,6 +464,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": "boxSizer9"
Expand All @@ -471,6 +491,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer7"
Expand Down Expand Up @@ -740,6 +764,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": "staticBoxSizer17"
Expand Down Expand Up @@ -1429,6 +1457,10 @@
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Enable Window Persistency:",
"m_value": true
}, {
"type": "string",
"m_label": "Title:",
Expand Down Expand Up @@ -1492,6 +1524,10 @@
"m_styles": [],
"m_sizerFlags": [],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer5"
Expand All @@ -1515,6 +1551,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer6"
Expand Down Expand Up @@ -1701,6 +1741,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer7"
Expand All @@ -1724,6 +1768,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": "bSizer2"
Expand Down Expand Up @@ -1912,6 +1960,10 @@
"m_styles": [],
"m_sizerFlags": ["wxEXPAND"],
"m_properties": [{
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "bSizer12"
Expand All @@ -1935,6 +1987,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": "fgSizer4"
Expand Down
Loading

0 comments on commit 2c376c2

Please sign in to comment.