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

Applied patch [ 829144 ] Compilation error fixes for samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 10:32:15 +00:00
parent 4666bb5f2e
commit 206d3a16ca
13 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samples/widgets/button.cpp
View File

@@ -127,8 +127,8 @@ BEGIN_EVENT_TABLE(ButtonWidgetsPage, WidgetsPage)
EVT_BUTTON(ButtonPage_Reset, ButtonWidgetsPage::OnButtonReset)
EVT_BUTTON(ButtonPage_ChangeLabel, ButtonWidgetsPage::OnButtonChangeLabel)
EVT_CHECKBOX(-1, ButtonWidgetsPage::OnCheckOrRadioBox)
EVT_RADIOBOX(-1, ButtonWidgetsPage::OnCheckOrRadioBox)
EVT_CHECKBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)
EVT_RADIOBOX(wxID_ANY, ButtonWidgetsPage::OnCheckOrRadioBox)
END_EVENT_TABLE()
// ============================================================================
@@ -159,7 +159,7 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
@@ -189,10 +189,10 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
_T("bottom"),
};
m_radioHAlign = new wxRadioBox(this, -1, _T("&Horz alignment"),
m_radioHAlign = new wxRadioBox(this, wxID_ANY, _T("&Horz alignment"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(halign), halign);
m_radioVAlign = new wxRadioBox(this, -1, _T("&Vert alignment"),
m_radioVAlign = new wxRadioBox(this, wxID_ANY, _T("&Vert alignment"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(valign), valign);
@@ -205,12 +205,12 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Operations"));
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Operations"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxSizer *sizerRow = CreateSizerWithTextAndButton(ButtonPage_ChangeLabel,
_T("Change label"),
-1,
wxID_ANY,
&m_textLabel);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
@@ -232,7 +232,6 @@ ButtonWidgetsPage::ButtonWidgetsPage(wxNotebook *notebook,
// final initializations
Reset();
SetAutoLayout(TRUE);
SetSizer(sizerTop);
sizerTop->Fit(this);
@@ -248,9 +247,9 @@ ButtonWidgetsPage::~ButtonWidgetsPage()
void ButtonWidgetsPage::Reset()
{
m_chkFit->SetValue(TRUE);
m_chkImage->SetValue(FALSE);
m_chkDefault->SetValue(FALSE);
m_chkFit->SetValue(true);
m_chkImage->SetValue(false);
m_chkDefault->SetValue(false);
m_radioHAlign->SetSelection(ButtonHAlign_Centre);
m_radioVAlign->SetSelection(ButtonVAlign_Centre);