X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61c083e7818114734695cb26aa006098a86e62c3..a13acfd8038210b0396816b6e078a92219a33539:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index b8a1827dbd..b113708fdb 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -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 //---------------------------------------------------------------------- @@ -72,6 +77,7 @@ public: virtual ~MyPanel(); void OnSize( wxSizeEvent& event ); + void OnIdle( wxIdleEvent &event ); void OnListBox( wxCommandEvent &event ); void OnListBoxDoubleClick( wxCommandEvent &event ); void OnListBoxButtons( wxCommandEvent &event ); @@ -96,10 +102,12 @@ public: 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 - + void OnNewText( wxCommandEvent &event ); #if wxUSE_SPINCTRL void OnSpinCtrl(wxSpinEvent& event); void OnSpinCtrlUp(wxSpinEvent& event); @@ -111,6 +119,7 @@ public: void OnChangeColour(wxCommandEvent& event); void OnTestButton(wxCommandEvent& event); void OnBmpButton(wxCommandEvent& event); + void OnBmpButtonToggle(wxCommandEvent& event); void OnSizerCheck (wxCommandEvent &event); @@ -123,16 +132,24 @@ 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 + wxStaticText *m_wrappingText; + wxStaticText *m_nonWrappingText; #if wxUSE_SPINCTRL wxSpinCtrl *m_spinctrl; @@ -298,6 +315,42 @@ private: DECLARE_EVENT_TABLE() }; +// a choice which handles focus set/kill (for testing) +class MyChoice : public wxChoice +{ +public: + MyChoice(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxChoiceNameStr ) + : wxChoice(parent, id, pos, size, n, choices, + style, validator, name) { } + +protected: + void OnFocusGot(wxFocusEvent& event) + { + wxLogMessage(_T("MyChoice::OnFocusGot")); + + event.Skip(); + } + + void OnFocusLost(wxFocusEvent& event) + { + wxLogMessage(_T("MyChoice::OnFocusLost")); + + event.Skip(); + } + +private: + DECLARE_EVENT_TABLE() +}; + + + //---------------------------------------------------------------------- // other //---------------------------------------------------------------------- @@ -316,9 +369,9 @@ IMPLEMENT_APP(MyApp) enum { - CONTROLS_QUIT = 100, - CONTROLS_TEXT, - CONTROLS_ABOUT, + CONTROLS_QUIT = wxID_EXIT, + CONTROLS_ABOUT = wxID_ABOUT, + CONTROLS_TEXT = 100, CONTROLS_CLEAR_LOG, // tooltip menu @@ -397,17 +450,26 @@ 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_BTNNEWTEXT = 186; 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,6 +482,7 @@ const int ID_SIZER_CHECKBIG = 206; BEGIN_EVENT_TABLE(MyPanel, wxPanel) EVT_SIZE ( MyPanel::OnSize) +EVT_IDLE ( MyPanel::OnIdle) EVT_BOOKCTRL_PAGE_CHANGING(ID_BOOK, MyPanel::OnPageChanging) EVT_BOOKCTRL_PAGE_CHANGED(ID_BOOK, MyPanel::OnPageChanged) EVT_LISTBOX (ID_LISTBOX, MyPanel::OnListBox) @@ -461,13 +524,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 +542,13 @@ 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_BUTTON (ID_BTNNEWTEXT, MyPanel::OnNewText) 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) @@ -511,6 +576,11 @@ BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox) EVT_KILL_FOCUS(MyRadioBox::OnFocusLost) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(MyChoice, wxChoice) + EVT_SET_FOCUS(MyChoice::OnFocusGot) + EVT_KILL_FOCUS(MyChoice::OnFocusLost) +END_EVENT_TABLE() + // ============================================================================ // implementation // ============================================================================ @@ -523,18 +593,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; @@ -566,7 +642,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 +663,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 )); +#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++ ) @@ -614,7 +714,9 @@ 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 @@ -622,7 +724,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) 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 ); @@ -662,8 +764,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #if wxUSE_CHOICE 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), + m_choice = new MyChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,wxDefaultCoord), 5, choices ); + m_choiceSorted = new MyChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,wxDefaultCoord), 5, choices, wxCB_SORT ); SetChoiceClientData(wxT("choice"), m_choice); @@ -728,55 +830,88 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize ); m_book->AddPage(panel, _T("wxRadioBox"), false, Image_Radio); + +#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 ); + + wxBoxSizer *main_sizer = new wxBoxSizer( wxHORIZONTAL ); + panel->SetSizer( main_sizer ); + + wxStaticBoxSizer *gauge_sizer = new wxStaticBoxSizer( wxHORIZONTAL, panel, _T("&wxGauge and wxSlider") ); + main_sizer->Add( gauge_sizer, 0, wxALL, 5 ); + wxBoxSizer *sz = new wxBoxSizer( wxVERTICAL ); + gauge_sizer->Add( sz ); + m_gauge = new wxGauge( panel, wxID_ANY, 200, wxDefaultPosition, wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER ); m_gauge->SetBackgroundColour(*wxGREEN); m_gauge->SetForegroundColour(*wxRED); - 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 ); + sz->Add( m_gauge, 0, wxALL, 10 ); + m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, + wxDefaultPosition, 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 + sz->Add( m_slider, 0, wxALL, 10 ); + + m_gaugeVert = new wxGauge( panel, wxID_ANY, 100, + wxDefaultPosition, wxSize(wxDefaultCoord, 90), + wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER ); + gauge_sizer->Add( m_gaugeVert, 0, wxALL, 10 ); + - (void)new wxStaticBox( panel, wxID_ANY, _T("&Explanation"), - wxPoint(230,10), wxSize(270,130), - wxALIGN_CENTER ); + + wxStaticBox *sb = new wxStaticBox( panel, wxID_ANY, _T("&Explanation"), + wxDefaultPosition, wxDefaultSize ); //, wxALIGN_CENTER ); + wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL ); + main_sizer->Add( wrapping_sizer, 0, wxALL, 5 ); #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( - (void)new wxStaticText( panel, wxID_ANY, + m_wrappingText = new wxStaticText( panel, wxID_ANY, _T("Drag the slider!"), wxPoint(250,30), wxSize(240, wxDefaultCoord) ); #else - (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") - _T("\n") - _T("This is also supposed to demonstrate how\n") - _T("to use static controls.\n"), - wxPoint(250,25), - wxSize(240, 110) + m_wrappingText = new wxStaticText( panel, wxID_ANY, + _T("In order see the gauge (aka progress bar) ") + _T("control do something you have to drag the ") + _T("handle of the slider to the right.") + _T("\n\n") + _T("This is also supposed to demonstrate how ") + _T("to use static controls with line wrapping."), + wxDefaultPosition, + wxSize(240, -1) ); #endif + wrapping_sizer->Add( m_wrappingText ); + + wxStaticBoxSizer *non_wrapping_sizer = new wxStaticBoxSizer( wxVERTICAL, panel, wxT("Non-wrapping") ); + main_sizer->Add( non_wrapping_sizer, 0, wxALL, 5 ); + + m_nonWrappingText = new wxStaticText( panel, wxID_ANY, + _T("This static text has two lines.\nThey do not wrap."), + wxDefaultPosition, + wxDefaultSize + ); + non_wrapping_sizer->Add( m_nonWrappingText ); + + (void)new wxButton( panel, ID_BTNNEWTEXT, wxT("New text"), wxPoint(450, 160) ); + int initialSpinValue = -5; wxString s; s << initialSpinValue; 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, wxDefaultCoord) ); + m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160) ); 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 @@ -786,6 +921,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #endif // wxUSE_SPINCTRL m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge); +#endif // wxUSE_SLIDER && wxUSE_GAUGE + panel = new wxPanel(m_book); @@ -808,6 +945,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 +955,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,13 +972,8 @@ 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, @@ -917,6 +1051,39 @@ void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 ); } +void MyPanel::OnIdle(wxIdleEvent& event) +{ + static const int INVALID_SELECTION = -2; + + static int s_selCombo = INVALID_SELECTION; + int sel = m_combo->GetSelection(); + if ( sel != s_selCombo ) + { + if ( s_selCombo != INVALID_SELECTION ) + { + wxLogMessage(_T("EVT_IDLE: combobox selection changed from %d to %d"), + s_selCombo, sel); + } + + s_selCombo = sel; + } + + static int s_selChoice = INVALID_SELECTION; + sel = m_choice->GetSelection(); + if ( sel != s_selChoice ) + { + if ( s_selChoice != INVALID_SELECTION ) + { + wxLogMessage(_T("EVT_IDLE: choice selection changed from %d to %d"), + s_selChoice, sel); + } + + s_selChoice = sel; + } + + event.Skip(); +} + void MyPanel::OnPageChanging( wxBookCtrlEvent &event ) { int selOld = event.GetOldSelection(); @@ -958,6 +1125,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; @@ -1189,20 +1361,18 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) void MyPanel::OnCombo( wxCommandEvent &event ) { - m_text->AppendText( _T("ComboBox event selection string is: ") ); - m_text->AppendText( event.GetString() ); - m_text->AppendText( _T("\n") ); - m_text->AppendText( _T("ComboBox control selection string is: ") ); - m_text->AppendText( m_combo->GetStringSelection() ); - m_text->AppendText( _T("\n") ); + wxLogMessage(_T("EVT_COMBOBOX: item %d/%d (event/control), string \"%s\"/\"%s\""), + (int)event.GetInt(), + m_combo->GetSelection(), + event.GetString().c_str(), + m_combo->GetStringSelection().c_str()); } void MyPanel::OnComboTextChanged(wxCommandEvent& event) { - wxString str; - str.Printf( wxT("Text in the combobox changed: now is '%s'."), - event.GetString().c_str() ); - wxLogMessage( str.c_str() ); + wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."), + event.GetString().c_str(), + m_combo->GetValue().c_str()); } void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event)) @@ -1312,12 +1482,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 +1586,15 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event ) m_text->AppendText(value); } +void MyPanel::OnNewText( wxCommandEvent& /* event */) +{ + m_nonWrappingText->SetLabel( wxT("This text is short\nbut still spans\nover three lines.") ); + m_wrappingText->SetLabel( wxT("This text is short but will still be wrapped if it is too long.") ); + m_wrappingText->GetParent()->Layout(); +} + +#if wxUSE_PROGRESSDLG + void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event ) { event.Enable( m_spinbutton->GetValue() > 0 ); @@ -1465,6 +1650,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) } } +#endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN void MyPanel::OnSizerCheck( wxCommandEvent &event) @@ -1584,10 +1770,13 @@ void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) { + SetSize(800, 600); +#if 0 wxBusyCursor bc; wxMessageDialog dialog(this, _T("This is a control sample"), _T("About Controls"), wxOK ); dialog.ShowModal(); +#endif } void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))