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

added conditional compilation for toggle buttons (wxUSE_TOGGLEBTN)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-03-31 13:46:37 +00:00
parent 496e58550c
commit 4c36ca57a1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/controls/controls.cpp
View File

@@ -479,7 +479,9 @@ EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl)
#endif // wxUSE_SPINCTRL #endif // wxUSE_SPINCTRL
#if wxUSE_TOGGLEBTN
EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
#endif // wxUSE_TOGGLEBTN
EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour) EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour)
EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton) EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton)
EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton) EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton)
@@ -743,7 +745,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16. #if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
wxPoint(10, 10)); wxPoint(10, 10));
@@ -786,8 +788,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
bmpBtn->SetBitmapSelected(bmp2); bmpBtn->SetBitmapSelected(bmp2);
bmpBtn->SetBitmapFocus(bmp3); bmpBtn->SetBitmapFocus(bmp3);
#if wxUSE_TOGGLEBTN
(void)new wxToggleButton(panel, ID_BUTTON_LABEL, (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
"&Toggle label", wxPoint(250, 20)); "&Toggle label", wxPoint(250, 20));
#endif // wxUSE_TOGGLEBTN
m_label = new wxStaticText(panel, -1, "Label with some long text", m_label = new wxStaticText(panel, -1, "Label with some long text",
wxPoint(250, 60), wxDefaultSize, wxPoint(250, 60), wxDefaultSize,
wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/); wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);