X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/516ab3990820ea7fa60d0269e8dc22fb1457a174..cda6fc01ba80a7a0cd159d10ccaeaea6573bf41b:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 72f1a0d4b9..56a209450e 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 //---------------------------------------------------------------------- @@ -101,7 +106,7 @@ public: 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); @@ -113,6 +118,7 @@ public: void OnChangeColour(wxCommandEvent& event); void OnTestButton(wxCommandEvent& event); void OnBmpButton(wxCommandEvent& event); + void OnBmpButtonToggle(wxCommandEvent& event); void OnSizerCheck (wxCommandEvent &event); @@ -141,6 +147,8 @@ public: wxButton *m_btnProgress; #endif // wxUSE_PROGRESSDLG #endif // wxUSE_SPINBTN + wxStaticText *m_wrappingText; + wxStaticText *m_nonWrappingText; #if wxUSE_SPINCTRL wxSpinCtrl *m_spinctrl; @@ -419,10 +427,12 @@ 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; @@ -494,15 +504,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) @@ -673,7 +681,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 ); @@ -779,51 +787,81 @@ 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); @@ -842,6 +880,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_book->AddPage(panel, _T("wxGauge"), false, Image_Gauge); #endif // wxUSE_SLIDER && wxUSE_GAUGE + panel = new wxPanel(m_book); #if !defined(__WXMOTIF__) // wxStaticBitmap not working under Motif yet. @@ -863,6 +902,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 @@ -871,7 +912,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 @@ -888,13 +929,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, @@ -1013,6 +1049,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; @@ -1471,6 +1512,13 @@ 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 )