X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/35960bbf2200d71e7ba5c8891f982c85585be064..fe6cf1284497c450735cdeb76cc99de9b18beb5f:/samples/controls/controls.cpp?ds=sidebyside diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 4fea525155..aafd3d3b44 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -23,7 +23,7 @@ #include "wx/spinbutt.h" #endif #include "wx/tglbtn.h" -#include "wx/notebook.h" +#include "wx/bookctrl.h" #include "wx/imaglist.h" #include "wx/artprov.h" @@ -55,6 +55,11 @@ #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL +#if !wxUSE_TOGGLEBTN + #define wxToggleButton wxCheckBox + #define EVT_TOGGLEBUTTON EVT_CHECKBOX +#endif + //---------------------------------------------------------------------- // class definitions //---------------------------------------------------------------------- @@ -88,16 +93,18 @@ public: void OnRadioButton1( wxCommandEvent &event ); void OnRadioButton2( wxCommandEvent &event ); void OnSetFont( wxCommandEvent &event ); - void OnPageChanged( wxNotebookEvent &event ); - void OnPageChanging( wxNotebookEvent &event ); + void OnPageChanged( wxBookCtrlEvent &event ); + void OnPageChanging( wxBookCtrlEvent &event ); void OnSliderUpdate( wxCommandEvent &event ); void OnUpdateLabel( wxCommandEvent &event ); #if wxUSE_SPINBTN void OnSpinUp( wxSpinEvent &event ); void OnSpinDown( wxSpinEvent &event ); void OnSpinUpdate( wxSpinEvent &event ); +#if wxUSE_PROGRESSDLG void OnUpdateShowProgress( wxUpdateUIEvent& event ); void OnShowProgress( wxCommandEvent &event ); +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL @@ -111,6 +118,7 @@ public: void OnChangeColour(wxCommandEvent& event); void OnTestButton(wxCommandEvent& event); void OnBmpButton(wxCommandEvent& event); + void OnBmpButtonToggle(wxCommandEvent& event); void OnSizerCheck (wxCommandEvent &event); @@ -123,15 +131,21 @@ public: wxComboBox *m_combo; wxRadioBox *m_radio; +#if wxUSE_GAUGE wxGauge *m_gauge, *m_gaugeVert; +#endif // wxUSE_GAUGE +#if wxUSE_SLIDER wxSlider *m_slider; +#endif // wxUSE_SLIDER wxButton *m_fontButton; wxButton *m_lbSelectNum; wxButton *m_lbSelectThis; #if wxUSE_SPINBTN wxSpinButton *m_spinbutton; +#if wxUSE_PROGRESSDLG wxButton *m_btnProgress; +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL @@ -142,7 +156,7 @@ public: wxCheckBox *m_checkbox; wxTextCtrl *m_text; - wxNotebook *m_notebook; + wxBookCtrl *m_book; wxStaticText *m_label; @@ -355,7 +369,7 @@ bool MyApp::OnInit() // MyPanel //---------------------------------------------------------------------- -const int ID_NOTEBOOK = 1000; +const int ID_BOOK = 1000; const int ID_LISTBOX = 130; const int ID_LISTBOX_SEL_NUM = 131; @@ -397,17 +411,25 @@ const int ID_RADIOBUTTON_2 = 167; const int ID_SET_FONT = 170; +#if wxUSE_GAUGE const int ID_GAUGE = 180; +#endif // wxUSE_GAUGE + +#if wxUSE_SLIDER const int ID_SLIDER = 181; +#endif // wxUSE_SLIDER const int ID_SPIN = 182; +#if wxUSE_PROGRESSDLG const int ID_BTNPROGRESS = 183; +#endif // wxUSE_PROGRESSDLG const int ID_BUTTON_LABEL = 184; const int ID_SPINCTRL = 185; const int ID_BUTTON_TEST1 = 190; const int ID_BUTTON_TEST2 = 191; const int ID_BITMAP_BTN = 192; +const int ID_BITMAP_BTN_ENABLE = 193; const int ID_CHANGE_COLOUR = 200; @@ -420,8 +442,8 @@ const int ID_SIZER_CHECKBIG = 206; BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_SIZE ( MyPanel::OnSize) -EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging) -EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyPanel::OnPageChanged) +EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK, MyPanel::OnPageChanging) +EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK, MyPanel::OnPageChanged) EVT_LISTBOX (ID_LISTBOX, MyPanel::OnListBox) EVT_LISTBOX (ID_LISTBOX_SORTED, MyPanel::OnListBox) EVT_LISTBOX_DCLICK(ID_LISTBOX, MyPanel::OnListBoxDoubleClick) @@ -461,13 +483,17 @@ EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons) EVT_RADIOBUTTON(ID_RADIOBUTTON_1, MyPanel::OnRadioButton1) EVT_RADIOBUTTON(ID_RADIOBUTTON_2, MyPanel::OnRadioButton2) EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont) +#if wxUSE_SLIDER EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate) +#endif // wxUSE_SLIDER #if wxUSE_SPINBTN EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate) EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp) EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown) +#if wxUSE_PROGRESSDLG EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress) EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress) +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) @@ -475,15 +501,12 @@ EVT_SPIN_UP (ID_SPINCTRL, MyPanel::OnSpinCtrlUp) EVT_SPIN_DOWN (ID_SPINCTRL, MyPanel::OnSpinCtrlDown) EVT_TEXT (ID_SPINCTRL, MyPanel::OnSpinCtrlText) #endif // wxUSE_SPINCTRL -#if wxUSE_TOGGLEBTN EVT_TOGGLEBUTTON(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) -#else -EVT_CHECKBOX(ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) -#endif // wxUSE_TOGGLEBTN EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour) EVT_BUTTON (ID_BUTTON_TEST1, MyPanel::OnTestButton) EVT_BUTTON (ID_BUTTON_TEST2, MyPanel::OnTestButton) EVT_BUTTON (ID_BITMAP_BTN, MyPanel::OnBmpButton) +EVT_TOGGLEBUTTON(ID_BITMAP_BTN_ENABLE, MyPanel::OnBmpButtonToggle) EVT_CHECKBOX (ID_SIZER_CHECK1, MyPanel::OnSizerCheck) EVT_CHECKBOX (ID_SIZER_CHECK2, MyPanel::OnSizerCheck) @@ -523,18 +546,24 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #if wxUSE_CHOICE m_choice = NULL; m_choiceSorted = NULL; -#endif +#endif // wxUSE_CHOICE m_combo = NULL; m_radio = NULL; +#if wxUSE_GAUGE m_gauge = NULL; m_gaugeVert = NULL; +#endif // wxUSE_GAUGE +#if wxUSE_SLIDER m_slider = NULL; +#endif // wxUSE_SLIDER m_fontButton = NULL; m_lbSelectNum = NULL; m_lbSelectThis = NULL; #if wxUSE_SPINBTN m_spinbutton = NULL; +#if wxUSE_PROGRESSDLG m_btnProgress = NULL; +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL m_spinctrl = NULL; @@ -542,7 +571,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_spintext = NULL; m_checkbox = NULL; m_text = NULL; - m_notebook = NULL; + m_book = NULL; m_label = NULL; m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"), @@ -551,7 +580,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); - m_notebook = new wxNotebook(this, ID_NOTEBOOK); + m_book = new wxBookCtrl(this, ID_BOOK); wxString choices[] = { @@ -566,7 +595,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) // image ids enum { - Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max + Image_List, + Image_Choice, + Image_Combo, + Image_Text, + Image_Radio, +#if wxUSE_GAUGE + Image_Gauge, +#endif // wxUSE_GAUGE + Image_Max }; // fill the image list @@ -579,20 +616,36 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) imagelist-> Add( wxBitmap( combo_xpm )); imagelist-> Add( wxBitmap( text_xpm )); imagelist-> Add( wxBitmap( radio_xpm )); +#if wxUSE_GAUGE imagelist-> Add( wxBitmap( gauge_xpm )); - m_notebook->SetImageList(imagelist); +#endif // wxUSE_GAUGE + m_book->SetImageList(imagelist); #elif defined(__WXMSW__) // load images from resources enum { - Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max + Image_List, + Image_Choice, + Image_Combo, + Image_Text, + Image_Radio, +#if wxUSE_GAUGE + Image_Gauge, +#endif // wxUSE_GAUGE + Image_Max }; wxImageList *imagelist = new wxImageList(16, 16, false, Image_Max); static const wxChar *s_iconNames[Image_Max] = { - _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"), - _T("gauge") + _T("list") + , _T("choice") + , _T("combo") + , _T("text") + , _T("radio") +#if wxUSE_GAUGE + , _T("gauge") +#endif // wxUSE_GAUGE }; for ( size_t n = 0; n < Image_Max; n++ ) @@ -600,12 +653,12 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxBitmap bmp(s_iconNames[n]); if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) ) { - wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."), + wxLogWarning(wxT("Couldn't load the image '%s' for the book control page %d."), s_iconNames[n], n); } } - m_notebook->SetImageList(imagelist); + m_book->SetImageList(imagelist); #else // No images for now @@ -614,15 +667,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #define Image_Combo -1 #define Image_Text -1 #define Image_Radio -1 +#if wxUSE_GAUGE #define Image_Gauge -1 +#endif // wxUSE_GAUGE #define Image_Max -1 #endif - wxPanel *panel = new wxPanel(m_notebook); + wxPanel *panel = new wxPanel(m_book); m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), - 5, choices, wxLB_ALWAYS_SB ); + 5, choices, wxLB_MULTIPLE |wxLB_ALWAYS_SB ); m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED, wxPoint(10,90), wxSize(120,70), 5, choices, wxLB_SORT ); @@ -658,10 +713,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"), wxPoint(110,170) ); panel->SetCursor(wxCursor(wxCURSOR_HAND)); - m_notebook->AddPage(panel, _T("wxListBox"), true, Image_List); + m_book->AddPage(panel, _T("wxListBox"), true, Image_List); #if wxUSE_CHOICE - panel = new wxPanel(m_notebook); + panel = new wxPanel(m_book); m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices ); m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord), 5, choices, wxCB_SORT ); @@ -679,10 +734,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) ); - m_notebook->AddPage(panel, _T("wxChoice"), false, Image_Choice); + m_book->AddPage(panel, _T("wxChoice"), false, Image_Choice); #endif // wxUSE_CHOICE - panel = new wxPanel(m_notebook); + panel = new wxPanel(m_book); (void)new wxStaticBox( panel, wxID_ANY, _T("&Box around combobox"), wxPoint(5, 5), wxSize(150, 100)); m_combo = new MyComboBox( panel, ID_COMBO, _T("This"), @@ -698,7 +753,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) ); - m_notebook->AddPage(panel, _T("wxComboBox"), false, Image_Combo); + m_book->AddPage(panel, _T("wxComboBox"), false, Image_Combo); wxString choices2[] = { @@ -708,7 +763,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) "Seventh", "Eighth", "Nineth", "Tenth" */ }; - panel = new wxPanel(m_notebook); + panel = new wxPanel(m_book); (void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxDefaultSize, WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS ); m_radio = new wxRadioBox( panel, ID_RADIOBOX, _T("T&his"), wxPoint(10,10), wxDefaultSize, WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); m_radio->SetForegroundColour(*wxRED); @@ -726,9 +781,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP ); rb->SetValue( false ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize ); - m_notebook->AddPage(panel, _T("wxRadioBox"), false, Image_Radio); + m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio); - panel = new wxPanel(m_notebook); +#if wxUSE_SLIDER && wxUSE_GAUGE + panel = new wxPanel(m_book); (void)new wxStaticBox( panel, wxID_ANY, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) ); m_gauge = new wxGauge( panel, wxID_ANY, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER ); m_gauge->SetBackgroundColour(*wxGREEN); @@ -736,8 +792,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_gaugeVert = new wxGauge( panel, wxID_ANY, 100, wxPoint(195,35), wxSize(30, 90), wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER ); - m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,wxDefaultCoord), - wxSL_AUTOTICKS | wxSL_LABELS ); + m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, + wxPoint(18,85), wxSize(155,wxDefaultCoord), + wxSL_AUTOTICKS | wxSL_LABELS); m_slider->SetTickFreq(40, 0); #if wxUSE_TOOLTIPS m_slider->SetToolTip(_T("This is a sliding slider")); @@ -775,8 +832,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_spinbutton->SetRange(-40,30); m_spinbutton->SetValue(initialSpinValue); +#if wxUSE_PROGRESSDLG m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"), wxPoint(300, 160) ); +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL @@ -785,9 +844,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_spinctrl->SetValue(15); #endif // wxUSE_SPINCTRL - m_notebook->AddPage(panel, _T("wxGauge"), false, Image_Gauge); + m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge); +#endif // wxUSE_SLIDER && wxUSE_GAUGE - panel = new wxPanel(m_notebook); + panel = new wxPanel(m_book); #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet. wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION); @@ -808,6 +868,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) dc.SelectObject( wxNullBitmap ); (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20)); + (void)new wxToggleButton(panel, ID_BITMAP_BTN_ENABLE, + _T("Enable/disable &bitmap"), wxPoint(100, 140)); #if defined(__WXMSW__) || defined(__WXMOTIF__) // test for masked bitmap display @@ -816,7 +878,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) { bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); - (void)new wxStaticBitmap /* wxBitmapButton */ (panel, wxID_ANY, bitmap, wxPoint(300, 120)); + (void)new wxStaticBitmap(panel, wxID_ANY, bitmap, wxPoint(300, 120)); } #endif @@ -833,31 +895,26 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) bmpBtn->SetBitmapSelected(bmp2); bmpBtn->SetBitmapFocus(bmp3); -#if wxUSE_TOGGLEBTN (void)new wxToggleButton(panel, ID_BUTTON_LABEL, _T("&Toggle label"), wxPoint(250, 20)); -#else - (void)new wxCheckBox(panel, ID_BUTTON_LABEL, - _T("&Toggle label"), wxPoint(250, 20)); -#endif // wxUSE_TOGGLEBTN m_label = new wxStaticText(panel, wxID_ANY, _T("Label with some long text"), wxPoint(250, 60), wxDefaultSize, wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/); m_label->SetForegroundColour( *wxBLUE ); - m_notebook->AddPage(panel, _T("wxBitmapXXX")); + m_book->AddPage(panel, _T("wxBitmapXXX")); // sizer - panel = new wxPanel(m_notebook); + panel = new wxPanel(m_book); panel->SetAutoLayout( true ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer *csizer = new wxStaticBoxSizer (new wxStaticBox (panel, wxID_ANY, _T("Show Buttons")), wxHORIZONTAL ); - + wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig; check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1")); check1->SetValue (true); @@ -877,13 +934,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big")); checkBig->SetValue (true); csizer->Add (checkBig); - + sizer->Add (csizer); m_hsizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonSizer = new wxBoxSizer (wxVERTICAL); - + m_sizerBtn1 = new wxButton(panel, wxID_ANY, _T("Test Button &1 (tab order 1)") ); m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 ); m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2 (tab order 3)") ); @@ -904,7 +961,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) panel->SetSizer( sizer ); - m_notebook->AddPage(panel, _T("wxSizer")); + m_book->AddPage(panel, _T("wxSizer")); } void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) @@ -913,11 +970,11 @@ void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) int y = 0; GetClientSize( &x, &y ); - if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 ); + if (m_book) m_book->SetSize( 2, 2, x-4, y*2/3-4 ); if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 ); } -void MyPanel::OnPageChanging( wxNotebookEvent &event ) +void MyPanel::OnPageChanging( wxBookCtrlEvent &event ) { int selOld = event.GetOldSelection(); if ( selOld == 2 ) @@ -934,16 +991,16 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event ) } } - *m_text << _T("Notebook selection is being changed from ") << selOld + *m_text << _T("Book selection is being changed from ") << selOld << _T(" to ") << event.GetSelection() - << _T(" (current page from notebook is ") - << m_notebook->GetSelection() << _T(")\n"); + << _T(" (current page from book is ") + << m_book->GetSelection() << _T(")\n"); } -void MyPanel::OnPageChanged( wxNotebookEvent &event ) +void MyPanel::OnPageChanged( wxBookCtrlEvent &event ) { - *m_text << _T("Notebook selection is now ") << event.GetSelection() - << _T(" (from notebook: ") << m_notebook->GetSelection() + *m_text << _T("Book selection is now ") << event.GetSelection() + << _T(" (from book: ") << m_book->GetSelection() << _T(")\n"); } @@ -958,6 +1015,11 @@ void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event)) wxLogMessage(_T("Bitmap button clicked.")); } +void MyPanel::OnBmpButtonToggle(wxCommandEvent& event) +{ + FindWindow(ID_BITMAP_BTN)->Enable(!event.IsChecked()); +} + void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) { static wxColour s_colOld; @@ -1312,12 +1374,18 @@ void MyPanel::OnUpdateLabel( wxCommandEvent &event ) : _T("Shorter text.")); } +#if wxUSE_SLIDER + void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) { +#if wxUSE_GAUGE m_gauge->SetValue( m_slider->GetValue() ); m_gaugeVert->SetValue( m_slider->GetValue() / 2 ); +#endif // wxUSE_GAUGE } +#endif // wxUSE_SLIDER + #if wxUSE_SPINCTRL void MyPanel::OnSpinCtrlText(wxCommandEvent& event) @@ -1410,6 +1478,8 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event ) m_text->AppendText(value); } +#if wxUSE_PROGRESSDLG + void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event ) { event.Enable( m_spinbutton->GetValue() > 0 ); @@ -1418,13 +1488,13 @@ void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event ) void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) { int max = m_spinbutton->GetValue(); - + if ( max <= 0 ) { wxLogError(_T("You must set positive range!")); return; } - + wxProgressDialog dialog(_T("Progress dialog example"), _T("An informative message"), max, // range @@ -1465,6 +1535,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) } } +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN void MyPanel::OnSizerCheck( wxCommandEvent &event) @@ -1503,7 +1574,7 @@ MyPanel::~MyPanel() //wxLog::RemoveTraceMask(_T("focus")); delete wxLog::SetActiveTarget(m_logTargetOld); - delete m_notebook->GetImageList(); + delete m_book->GetImageList(); } //----------------------------------------------------------------------