Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxUSE_STATLINE fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-22 11:45:02 +00:00
parent dd779a9e66
commit a56938e475
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/widgets/static.cpp
View File

@@ -170,7 +170,9 @@ protected:
wxStaticBox *m_staticBox; wxStaticBox *m_staticBox;
wxStaticBoxSizer *m_sizerStatBox; wxStaticBoxSizer *m_sizerStatBox;
wxStaticText *m_statText; wxStaticText *m_statText;
#if wxUSE_STATLINE
wxStaticLine *m_statLine; wxStaticLine *m_statLine;
#endif // wxUSE_STATLINE
wxSizer *m_sizerStatic; wxSizer *m_sizerStatic;
// the text entries for command parameters // the text entries for command parameters
@@ -214,7 +216,9 @@ StaticWidgetsPage::StaticWidgetsPage(wxNotebook *notebook,
m_radioHAlign = m_radioHAlign =
m_radioVAlign = (wxRadioBox *)NULL; m_radioVAlign = (wxRadioBox *)NULL;
#if wxUSE_STATLINE
m_statLine = (wxStaticLine *)NULL; m_statLine = (wxStaticLine *)NULL;
#endif // wxUSE_STATLINE
m_statText = (wxStaticText *)NULL; m_statText = (wxStaticText *)NULL;
m_staticBox = (wxStaticBox *)NULL; m_staticBox = (wxStaticBox *)NULL;
@@ -325,7 +329,9 @@ void StaticWidgetsPage::CreateStatic()
// delete m_sizerStatBox; -- deleted by Remove() // delete m_sizerStatBox; -- deleted by Remove()
m_sizerStatic->Remove(m_sizerStatBox); m_sizerStatic->Remove(m_sizerStatBox);
delete m_statText; delete m_statText;
#if wxUSE_STATLINE
delete m_statLine; delete m_statLine;
#endif // wxUSE_STATLINE
} }
int flagsBox = 0, int flagsBox = 0,
@@ -388,12 +394,16 @@ void StaticWidgetsPage::CreateStatic()
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
flagsText); flagsText);
#if wxUSE_STATLINE
m_statLine = new wxStaticLine(this, wxID_ANY, m_statLine = new wxStaticLine(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
isVert ? wxLI_VERTICAL : wxLI_HORIZONTAL); isVert ? wxLI_VERTICAL : wxLI_HORIZONTAL);
#endif // wxUSE_STATLINE
m_sizerStatBox->Add(m_statText, 1, wxGROW | wxALL, 5); m_sizerStatBox->Add(m_statText, 1, wxGROW | wxALL, 5);
#if wxUSE_STATLINE
m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5); m_sizerStatBox->Add(m_statLine, 0, wxGROW | wxALL, 5);
#endif // wxUSE_STATLINE
m_sizerStatBox->Add(0, 0, 1); m_sizerStatBox->Add(0, 0, 1);
m_sizerStatic->Add(m_sizerStatBox, 1, wxGROW); m_sizerStatic->Add(m_sizerStatBox, 1, wxGROW);