X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f159c531e431c58e6301d1b636390223ce05d8c..900a87655f9a8533817c82fdac7deaedf345b246:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 653a78f1b8..28a5d986cf 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: controls.cpp -// Purpose: Controls wxWindows sample +// Purpose: Controls wxWidgets sample // Author: Robert Roebling // Modified by: // RCS-ID: $Id$ @@ -8,10 +8,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "controls.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -27,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" @@ -49,17 +45,9 @@ #include "icons/gauge.xpm" #endif -#ifdef __WIN16__ - // Win16 doesn't have them - #ifdef wxUSE_SPINBTN - #undef wxUSE_SPINBTN - #endif - #define wxUSE_SPINBTN 0 -#else - #ifndef wxUSE_SPINBTN +#ifndef wxUSE_SPINBTN #define wxUSE_SPINBTN 1 - #endif -#endif // __WIN16__ +#endif #include "wx/progdlg.h" @@ -67,6 +55,11 @@ #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL +#if !wxUSE_TOGGLEBTN + #define wxToggleButton wxCheckBox + #define EVT_TOGGLEBUTTON EVT_CHECKBOX +#endif + //---------------------------------------------------------------------- // class definitions //---------------------------------------------------------------------- @@ -97,17 +90,21 @@ public: void OnComboButtons( wxCommandEvent &event ); void OnRadio( wxCommandEvent &event ); void OnRadioButtons( wxCommandEvent &event ); + 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 @@ -121,6 +118,7 @@ public: void OnChangeColour(wxCommandEvent& event); void OnTestButton(wxCommandEvent& event); void OnBmpButton(wxCommandEvent& event); + void OnBmpButtonToggle(wxCommandEvent& event); void OnSizerCheck (wxCommandEvent &event); @@ -133,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 @@ -152,7 +156,7 @@ public: wxCheckBox *m_checkbox; wxTextCtrl *m_text; - wxNotebook *m_notebook; + wxBookCtrl *m_book; wxStaticText *m_label; @@ -187,12 +191,15 @@ public: void OnEnableAll(wxCommandEvent& event); void OnIdle( wxIdleEvent& event ); + void OnIconized( wxIconizeEvent& event ); + void OnMaximized( wxMaximizeEvent& event ); void OnSize( wxSizeEvent& event ); void OnMove( wxMoveEvent& event ); MyPanel *GetPanel() const { return m_panel; } private: +#if wxUSE_STATUSBAR void UpdateStatusBar(const wxPoint& pos, const wxSize& size) { if ( m_frameStatusBar ) @@ -208,6 +215,7 @@ private: SetStatusText(msg, 1); } } +#endif // wxUSE_STATUSBAR MyPanel *m_panel; @@ -339,7 +347,7 @@ bool MyApp::OnInit() { // use standard command line handling: if ( !wxApp::OnInit() ) - return FALSE; + return false; // parse the cmd line int x = 50, @@ -351,17 +359,17 @@ bool MyApp::OnInit() } // Create the main frame window - MyFrame *frame = new MyFrame(_T("Controls wxWindows App"), x, y); - frame->Show(TRUE); + MyFrame *frame = new MyFrame(_T("Controls wxWidgets App"), x, y); + frame->Show(true); - return TRUE; + return true; } //---------------------------------------------------------------------- // MyPanel //---------------------------------------------------------------------- -const int ID_NOTEBOOK = 1000; +const int ID_BOOK = 1000; const int ID_LISTBOX = 130; const int ID_LISTBOX_SEL_NUM = 131; @@ -403,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; @@ -426,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) @@ -464,14 +480,20 @@ EVT_BUTTON (ID_RADIOBOX_SEL_NUM, MyPanel::OnRadioButtons) EVT_BUTTON (ID_RADIOBOX_SEL_STR, MyPanel::OnRadioButtons) EVT_BUTTON (ID_RADIOBOX_FONT, MyPanel::OnRadioButtons) 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) @@ -479,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) @@ -520,25 +539,31 @@ END_EVENT_TABLE() // ============================================================================ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) - : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ) + : wxPanel( frame, wxID_ANY, wxPoint(x, y), wxSize(w, h) ) { m_listbox = NULL; m_listboxSorted = NULL; #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; @@ -546,16 +571,16 @@ 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, -1, _T("This is the log window.\n"), + m_text = new wxTextCtrl(this, wxID_ANY, _T("This is the log window.\n"), wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE); m_text->SetBackgroundColour(wxT("wheat")); m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); - m_notebook = new wxNotebook(this, ID_NOTEBOOK); + m_book = new wxBookCtrl(this, ID_BOOK); wxString choices[] = { @@ -570,31 +595,57 @@ 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 - wxImageList *imagelist = new wxImageList(32, 32); + wxBitmap bmp(list_xpm); + + wxImageList *imagelist = new wxImageList(bmp.GetWidth(), bmp.GetHeight()); - imagelist-> Add( wxBitmap( list_xpm )); + imagelist-> Add( bmp ); imagelist-> Add( wxBitmap( choice_xpm )); 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); + 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++ ) @@ -602,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 @@ -616,12 +667,14 @@ 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 ); @@ -645,7 +698,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) ); button->SetDefault(); - button->SetForegroundColour(*wxBLUE); #if wxUSE_TOOLTIPS @@ -653,19 +705,20 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #endif // wxUSE_TOOLTIPS m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) ); - m_checkbox->SetValue(FALSE); + m_checkbox->SetValue(false); + button->MoveAfterInTabOrder(m_checkbox); #if wxUSE_TOOLTIPS m_checkbox->SetToolTip( _T("Click here to disable the listbox") ); #endif // wxUSE_TOOLTIPS (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); - m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices ); - m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1), + 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 ); SetChoiceClientData(wxT("choice"), m_choice); @@ -681,16 +734,17 @@ 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); - (void)new wxStaticBox( panel, -1, _T("&Box around combobox"), + 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"), - wxPoint(20,25), wxSize(120, -1), + wxPoint(20,25), wxSize(120, wxDefaultCoord), 5, choices, - /* wxCB_READONLY | */ wxPROCESS_ENTER); + wxCB_READONLY | wxPROCESS_ENTER); + m_combo->SetBackgroundColour(*wxBLUE); (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) ); @@ -699,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[] = { @@ -709,9 +763,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) "Seventh", "Eighth", "Nineth", "Tenth" */ }; - panel = new wxPanel(m_notebook); - (void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS ); - m_radio = new wxRadioBox( panel, ID_RADIOBOX, _T("T&his"), wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); + 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); #if wxUSE_TOOLTIPS @@ -725,38 +779,40 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize ); wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP ); - rb->SetValue( FALSE ); + 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); - (void)new wxStaticBox( panel, -1, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) ); - m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER ); +#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); m_gauge->SetForegroundColour(*wxRED); - m_gaugeVert = new wxGauge( panel, -1, 100, + 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,-1), - 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")); #endif // wxUSE_TOOLTIPS - (void)new wxStaticBox( panel, -1, _T("&Explanation"), + (void)new wxStaticBox( panel, wxID_ANY, _T("&Explanation"), wxPoint(230,10), wxSize(270,130), wxALIGN_CENTER ); #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( - (void)new wxStaticText( panel, -1, + (void)new wxStaticText( panel, wxID_ANY, _T("Drag the slider!"), wxPoint(250,30), - wxSize(240, -1) + wxSize(240, wxDefaultCoord) ); #else - (void)new wxStaticText( panel, -1, + (void)new wxStaticText( panel, wxID_ANY, _T("In order see the gauge (aka progress bar)\n") _T("control do something you have to drag the\n") _T("handle of the slider to the right.\n") @@ -770,32 +826,35 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) int initialSpinValue = -5; wxString s; s << initialSpinValue; - m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) ); + m_spintext = new wxTextCtrl( panel, wxID_ANY, s, wxPoint(20,160), wxSize(80,wxDefaultCoord) ); #if wxUSE_SPINBTN - m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) ); + m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, wxDefaultCoord) ); 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 - m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, -1) ); + m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, wxDefaultCoord) ); m_spinctrl->SetRange(10,30); 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__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16. +#if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet. wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION); - (void) new wxStaticBitmap( panel, -1, icon, wxPoint(10, 10) ); + (void) new wxStaticBitmap( panel, wxID_ANY, icon, wxPoint(10, 10) ); // VZ: don't leak memory - // bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10)); + // bmpStatic = new wxStaticBitmap(panel, wxID_ANY, wxNullIcon, wxPoint(50, 10)); // bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION)); #endif // !Motif @@ -809,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 @@ -817,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, -1, bitmap, wxPoint(300, 120)); + (void)new wxStaticBitmap(panel, wxID_ANY, bitmap, wxPoint(300, 120)); } #endif @@ -826,7 +887,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) bmp3(wxArtProvider::GetBitmap(wxART_QUESTION)); wxBitmapButton *bmpBtn = new wxBitmapButton ( - panel, -1, + panel, wxID_ANY, bmp1, wxPoint(30, 70) ); @@ -834,105 +895,73 @@ 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, -1, _T("Label with some long text"), + 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")); - - // layout constraints -#if wxUSE_CONSTRAINTS - wxLayoutConstraints *c; - - panel = new wxPanel(m_notebook); - panel->SetAutoLayout( TRUE ); - - c = new wxLayoutConstraints; - c->top.SameAs( panel, wxTop, 10 ); - c->height.AsIs( ); - c->left.SameAs( panel, wxLeft, 10 ); - c->width.PercentOf( panel, wxWidth, 40 ); - - wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, _T("Test Button &1") ); - pMyButton->SetConstraints( c ); - - c = new wxLayoutConstraints; - c->top.SameAs( panel, wxTop, 10 ); - c->bottom.SameAs( panel, wxBottom, 10 ); - c->right.SameAs( panel, wxRight, 10 ); - c->width.PercentOf( panel, wxWidth, 40 ); + m_book->AddPage(panel, _T("wxBitmapXXX")); - wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, _T("Test Button &2") ); - pMyButton2->SetConstraints( c ); - - m_notebook->AddPage(panel, _T("wxLayoutConstraint")); -#endif - // sizer - panel = new wxPanel(m_notebook); - panel->SetAutoLayout( TRUE ); + panel = new wxPanel(m_book); + panel->SetAutoLayout( true ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxStaticBoxSizer *csizer = - new wxStaticBoxSizer (new wxStaticBox (panel, -1, _T("Show Buttons")), - wxHORIZONTAL ); - + 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); + check1->SetValue (true); csizer->Add (check1); check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, _T("2")); - check2->SetValue (TRUE); + check2->SetValue (true); csizer->Add (check2); check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, _T("3")); - check3->SetValue (TRUE); + check3->SetValue (true); csizer->Add (check3); check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, _T("4")); - check4->SetValue (TRUE); + check4->SetValue (true); csizer->Add (check4); check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, _T("1-4")); - check14->SetValue (TRUE); + check14->SetValue (true); csizer->Add (check14); checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big")); - checkBig->SetValue (TRUE); + checkBig->SetValue (true); csizer->Add (checkBig); - + sizer->Add (csizer); m_hsizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonSizer = new wxBoxSizer (wxVERTICAL); - - m_sizerBtn1 = new wxButton(panel, -1, _T("Test Button &1") ); + + 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, -1, _T("Test Button &2") ); + m_sizerBtn2 = new wxButton(panel, wxID_ANY, _T("Test Button &2 (tab order 3)") ); m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 ); - m_sizerBtn3 = new wxButton(panel, -1, _T("Test Button &3") ); + m_sizerBtn3 = new wxButton(panel, wxID_ANY, _T("Test Button &3 (tab order 2)") ); m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 ); - m_sizerBtn4 = new wxButton(panel, -1, _T("Test Button &4") ); + m_sizerBtn4 = new wxButton(panel, wxID_ANY, _T("Test Button &4 (tab order 4)") ); m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 ); + m_sizerBtn3->MoveBeforeInTabOrder(m_sizerBtn2); + m_hsizer->Add (m_buttonSizer); m_hsizer->Add( 20,20, 1 ); - m_bigBtn = new wxButton(panel, -1, _T("Multiline\nbutton") ); + m_bigBtn = new wxButton(panel, wxID_ANY, _T("Multiline\nbutton") ); m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 ); sizer->Add (m_hsizer, 1, wxGROW); panel->SetSizer( sizer ); - m_notebook->AddPage(panel, _T("wxSizer")); + m_book->AddPage(panel, _T("wxSizer")); } void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) @@ -941,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 ) @@ -962,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"); } @@ -981,23 +1010,29 @@ void MyPanel::OnTestButton(wxCommandEvent& event) event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2')); } -void MyPanel::OnBmpButton(wxCommandEvent& event) +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; + SetThemeEnabled(false); // test panel colour changing and propagation to the subcontrols if ( s_colOld.Ok() ) { SetBackgroundColour(s_colOld); s_colOld = wxNullColour; - m_lbSelectThis->SetForegroundColour(wxT("red")); - m_lbSelectThis->SetBackgroundColour(wxT("white")); + m_lbSelectThis->SetForegroundColour(wxNullColour); + m_lbSelectThis->SetBackgroundColour(wxNullColour); } else { @@ -1088,9 +1123,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) } case ID_LISTBOX_SEL_STR: { - if (m_listbox->FindString(_T("This")) > -1) + if (m_listbox->FindString(_T("This")) != wxNOT_FOUND) m_listbox->SetStringSelection( _T("This") ); - if (m_listboxSorted->FindString(_T("This")) > -1) + if (m_listboxSorted->FindString(_T("This")) != wxNOT_FOUND) m_listboxSorted->SetStringSelection( _T("This") ); m_lbSelectNum->WarpPointer( 40, 14 ); break; @@ -1288,6 +1323,16 @@ void MyPanel::OnRadio( wxCommandEvent &event ) m_text->AppendText( _T("\n") ); } +void MyPanel::OnRadioButton1( wxCommandEvent & WXUNUSED(event) ) +{ + wxMessageBox(_T("First wxRadioButton selected."), _T("wxControl sample")); +} + +void MyPanel::OnRadioButton2( wxCommandEvent & WXUNUSED(event) ) +{ + m_text->AppendText(_T("Second wxRadioButton selected.\n")); +} + void MyPanel::OnRadioButtons( wxCommandEvent &event ) { switch (event.GetId()) @@ -1329,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) @@ -1427,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 ); @@ -1435,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 @@ -1454,7 +1507,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) wxPD_REMAINING_TIME); - bool cont = TRUE; + bool cont = true; for ( int i = 0; i <= max && cont; i++ ) { wxSleep(1); @@ -1482,6 +1535,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) } } +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN void MyPanel::OnSizerCheck( wxCommandEvent &event) @@ -1520,7 +1574,7 @@ MyPanel::~MyPanel() //wxLog::RemoveTraceMask(_T("focus")); delete wxLog::SetActiveTarget(m_logTargetOld); - delete m_notebook->GetImageList(); + delete m_book->GetImageList(); } //---------------------------------------------------------------------- @@ -1538,6 +1592,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll) + EVT_ICONIZE(MyFrame::OnIconized) + EVT_MAXIMIZE(MyFrame::OnMaximized) EVT_SIZE(MyFrame::OnSize) EVT_MOVE(MyFrame::OnMove) @@ -1545,13 +1601,15 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) END_EVENT_TABLE() MyFrame::MyFrame(const wxChar *title, int x, int y) - : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430)) + : wxFrame(NULL, wxID_ANY, title, wxPoint(x, y), wxSize(500, 430)) { // Give it an icon // The wxICON() macros loads an icon from a resource under Windows // and uses an #included XPM image under GTK+ and Motif +#ifdef USE_XPM SetIcon( wxICON(mondrian) ); +#endif wxMenu *file_menu = new wxMenu; @@ -1569,19 +1627,21 @@ MyFrame::MyFrame(const wxChar *title, int x, int y) tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, _T("Set &delay\tCtrl-D")); tooltip_menu->AppendSeparator(); tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"), - _T("enable/disable tooltips"), TRUE); - tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE); + _T("enable/disable tooltips"), true); + tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, true); menu_bar->Append(tooltip_menu, _T("&Tooltips")); #endif // wxUSE_TOOLTIPS wxMenu *panel_menu = new wxMenu; panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"), - _T("Enable/disable all panel controls"), TRUE); + _T("Enable/disable all panel controls"), true); menu_bar->Append(panel_menu, _T("&Panel")); SetMenuBar(menu_bar); +#if wxUSE_STATUSBAR CreateStatusBar(2); +#endif // wxUSE_STATUSBAR m_panel = new MyPanel( this, 10, 10, 300, 100 ); @@ -1590,7 +1650,7 @@ MyFrame::MyFrame(const wxChar *title, int x, int y) void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) { - Close(TRUE); + Close(true); } void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) @@ -1607,7 +1667,7 @@ void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) } #if wxUSE_TOOLTIPS -void MyFrame::OnSetTooltipDelay(wxCommandEvent& event) +void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event)) { static long s_delay = 5000; @@ -1628,9 +1688,9 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event) wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay); } -void MyFrame::OnToggleTooltips(wxCommandEvent& event) +void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event)) { - static bool s_enabled = TRUE; + static bool s_enabled = true; s_enabled = !s_enabled; @@ -1642,7 +1702,7 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event) void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event)) { - static bool s_enable = TRUE; + static bool s_enable = true; s_enable = !s_enable; m_panel->Enable(s_enable); @@ -1650,14 +1710,30 @@ void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnMove( wxMoveEvent& event ) { +#if wxUSE_STATUSBAR UpdateStatusBar(event.GetPosition(), GetSize()); +#endif // wxUSE_STATUSBAR event.Skip(); } +void MyFrame::OnIconized( wxIconizeEvent& event ) +{ + wxLogMessage(_T("Frame %s"), event.Iconized() ? _T("iconized") + : _T("restored")); + event.Skip(); +} + +void MyFrame::OnMaximized( wxMaximizeEvent& WXUNUSED(event) ) +{ + wxLogMessage(_T("Frame maximized")); +} + void MyFrame::OnSize( wxSizeEvent& event ) { +#if wxUSE_STATUSBAR UpdateStatusBar(GetPosition(), event.GetSize()); +#endif // wxUSE_STATUSBAR event.Skip(); } @@ -1684,7 +1760,9 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) #endif ); +#if wxUSE_STATUSBAR SetStatusText(msg); +#endif // wxUSE_STATUSBAR } }