X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80a58c9968cc740b50fb92cd95d6a014a1c6e9bf..32b70aec1ff90877ae0ce2ce82967f698218fbdc:/samples/controls/controls.cpp?ds=sidebyside diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index cb18539d48..541e0d5a5e 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -26,14 +26,16 @@ #if !defined( __WXMSW__ ) || defined( __WIN95__ ) #include "wx/spinbutt.h" #endif +#include "wx/tglbtn.h" #include "wx/notebook.h" #include "wx/imaglist.h" +#include "wx/artprov.h" #if wxUSE_TOOLTIPS #include "wx/tooltip.h" #endif -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) #define USE_XPM #endif @@ -85,9 +87,13 @@ public: void OnListBox( wxCommandEvent &event ); void OnListBoxDoubleClick( wxCommandEvent &event ); void OnListBoxButtons( wxCommandEvent &event ); +#if wxUSE_CHOICE void OnChoice( wxCommandEvent &event ); void OnChoiceButtons( wxCommandEvent &event ); +#endif void OnCombo( wxCommandEvent &event ); + void OnComboTextChanged( wxCommandEvent &event ); + void OnComboTextEnter( wxCommandEvent &event ); void OnComboButtons( wxCommandEvent &event ); void OnRadio( wxCommandEvent &event ); void OnRadioButtons( wxCommandEvent &event ); @@ -111,14 +117,18 @@ public: void OnEnableAll(wxCommandEvent& event); void OnChangeColour(wxCommandEvent& event); void OnTestButton(wxCommandEvent& event); + void OnBmpButton(wxCommandEvent& event); wxListBox *m_listbox, *m_listboxSorted; +#if wxUSE_CHOICE wxChoice *m_choice, *m_choiceSorted; +#endif wxComboBox *m_combo; wxRadioBox *m_radio; - wxGauge *m_gauge; + wxGauge *m_gauge, + *m_gaugeVert; wxSlider *m_slider; wxButton *m_fontButton; wxButton *m_lbSelectNum; @@ -149,7 +159,7 @@ private: class MyFrame: public wxFrame { public: - MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h); + MyFrame(const char *title, int x, int y); void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); @@ -171,10 +181,18 @@ public: private: void UpdateStatusBar(const wxPoint& pos, const wxSize& size) { - wxString msg; - msg.Printf(_("pos=(%d, %d), size=%dx%d"), - pos.x, pos.y, size.x, size.y); - SetStatusText(msg, 1); + if ( m_frameStatusBar ) + { + wxString msg; + wxSize sizeAll = GetSize(), + sizeCl = GetClientSize(); + msg.Printf(_("pos=(%d, %d), size=%dx%d or %dx%d (client=%dx%d)"), + pos.x, pos.y, + size.x, size.y, + sizeAll.x, sizeAll.y, + sizeCl.x, sizeCl.y); + SetStatusText(msg, 1); + } } MyPanel *m_panel; @@ -182,12 +200,102 @@ private: DECLARE_EVENT_TABLE() }; +// a button which intercepts double clicks (for testing...) +class MyButton : public wxButton +{ +public: + MyButton(wxWindow *parent, + wxWindowID id, + const wxString& label = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize) + : wxButton(parent, id, label, pos, size) + { + } + + void OnDClick(wxMouseEvent& event) + { + wxLogMessage(_T("MyButton::OnDClick")); + + event.Skip(); + } + +private: + DECLARE_EVENT_TABLE() +}; + +// a combo which intercepts chars (to test Windows behaviour) +class MyComboBox : public wxComboBox +{ +public: + MyComboBox(wxWindow *parent, wxWindowID id, + const wxString& value = wxEmptyString, + 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 = wxComboBoxNameStr) + : wxComboBox(parent, id, value, pos, size, n, choices, style, + validator, name) { } + +protected: + void OnChar(wxKeyEvent& event); + void OnKeyDown(wxKeyEvent& event); + void OnKeyUp(wxKeyEvent& event); + void OnFocusGot(wxFocusEvent& event) + { + wxLogMessage(_T("MyComboBox::OnFocusGot")); + + event.Skip(); + } + +private: + DECLARE_EVENT_TABLE() +}; + +// a radiobox which handles focus set/kill (for testing) +class MyRadioBox : public wxRadioBox +{ +public: + MyRadioBox(wxWindow *parent, + wxWindowID id, + const wxString& title = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + int n = 0, const wxString choices[] = NULL, + int majorDim = 1, + long style = wxRA_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxRadioBoxNameStr) + : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim, + style, validator, name) { } + +protected: + void OnFocusGot(wxFocusEvent& event) + { + wxLogMessage(_T("MyRadioBox::OnFocusGot")); + + event.Skip(); + } + + void OnFocusLost(wxFocusEvent& event) + { + wxLogMessage(_T("MyRadioBox::OnFocusLost")); + + event.Skip(); + } + +private: + DECLARE_EVENT_TABLE() +}; + //---------------------------------------------------------------------- // other //---------------------------------------------------------------------- -static void SetControlClientData(const char *name, - wxControlWithItems *control); +static void SetListboxClientData(const wxChar *name, wxListBox *control); +static void SetChoiceClientData(const wxChar *name, wxChoice *control); IMPLEMENT_APP(MyApp) @@ -212,62 +320,22 @@ enum bool MyApp::OnInit() { + // use standard command line handling: + if ( !wxApp::OnInit() ) + return FALSE; + // parse the cmd line int x = 50, y = 50; - if ( argc == 2 ) + if ( argc == 3 ) { - wxSscanf(argv[1], "%d", &x); - wxSscanf(argv[2], "%d", &y); + wxSscanf(wxString(argv[1]), wxT("%d"), &x); + wxSscanf(wxString(argv[2]), wxT("%d"), &y); } // Create the main frame window - MyFrame *frame = new MyFrame((wxFrame *) NULL, - "Controls wxWindows App", - x, y, 540, 430); - - frame->SetSizeHints( 500, 425 ); - - // 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 - - frame->SetIcon( wxICON(mondrian) ); - - wxMenu *file_menu = new wxMenu("", wxMENU_TEAROFF); - - file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L"); - file_menu->AppendSeparator(); - file_menu->Append(CONTROLS_ABOUT, "&About\tF1"); - file_menu->AppendSeparator(); - file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample"); - - wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - -#if wxUSE_TOOLTIPS - wxMenu *tooltip_menu = new wxMenu; - tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); - tooltip_menu->AppendSeparator(); - tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", - "enable/disable tooltips", TRUE); - tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE); - menu_bar->Append(tooltip_menu, "&Tooltips"); -#endif // wxUSE_TOOLTIPS - - wxMenu *panel_menu = new wxMenu; - panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E", - "Enable/disable all panel controls", TRUE); - menu_bar->Append(panel_menu, "&Panel"); - - frame->SetMenuBar(menu_bar); - + MyFrame *frame = new MyFrame("Controls wxWindows App", x, y); frame->Show(TRUE); - frame->SetCursor(wxCursor(wxCURSOR_HAND)); - - frame->GetPanel()->m_notebook->SetSelection(6); - - SetTopWindow(frame); return TRUE; } @@ -328,6 +396,7 @@ 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_CHANGE_COLOUR = 200; @@ -345,6 +414,7 @@ EVT_BUTTON (ID_LISTBOX_APPEND, MyPanel::OnListBoxButtons) EVT_BUTTON (ID_LISTBOX_DELETE, MyPanel::OnListBoxButtons) EVT_BUTTON (ID_LISTBOX_FONT, MyPanel::OnListBoxButtons) EVT_CHECKBOX (ID_LISTBOX_ENABLE, MyPanel::OnListBoxButtons) +#if wxUSE_CHOICE EVT_CHOICE (ID_CHOICE, MyPanel::OnChoice) EVT_CHOICE (ID_CHOICE_SORTED, MyPanel::OnChoice) EVT_BUTTON (ID_CHOICE_SEL_NUM, MyPanel::OnChoiceButtons) @@ -354,7 +424,10 @@ EVT_BUTTON (ID_CHOICE_APPEND, MyPanel::OnChoiceButtons) EVT_BUTTON (ID_CHOICE_DELETE, MyPanel::OnChoiceButtons) EVT_BUTTON (ID_CHOICE_FONT, MyPanel::OnChoiceButtons) EVT_CHECKBOX (ID_CHOICE_ENABLE, MyPanel::OnChoiceButtons) +#endif EVT_COMBOBOX (ID_COMBO, MyPanel::OnCombo) +EVT_TEXT (ID_COMBO, MyPanel::OnComboTextChanged) +EVT_TEXT_ENTER(ID_COMBO, MyPanel::OnComboTextEnter) EVT_BUTTON (ID_COMBO_SEL_NUM, MyPanel::OnComboButtons) EVT_BUTTON (ID_COMBO_SEL_STR, MyPanel::OnComboButtons) EVT_BUTTON (ID_COMBO_CLEAR, MyPanel::OnComboButtons) @@ -379,23 +452,46 @@ EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress) #if wxUSE_SPINCTRL EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) #endif // wxUSE_SPINCTRL -EVT_BUTTON (ID_BUTTON_LABEL, MyPanel::OnUpdateLabel) +#if wxUSE_TOGGLEBTN +EVT_TOGGLEBUTTON(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) +END_EVENT_TABLE() + +BEGIN_EVENT_TABLE(MyButton, wxButton) + EVT_LEFT_DCLICK(MyButton::OnDClick) +END_EVENT_TABLE() + +BEGIN_EVENT_TABLE(MyComboBox, wxComboBox) + EVT_CHAR(MyComboBox::OnChar) + EVT_KEY_DOWN(MyComboBox::OnKeyDown) + EVT_KEY_UP(MyComboBox::OnKeyUp) + + EVT_SET_FOCUS(MyComboBox::OnFocusGot) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox) + EVT_SET_FOCUS(MyRadioBox::OnFocusGot) + EVT_KILL_FOCUS(MyRadioBox::OnFocusLost) +END_EVENT_TABLE() + +// ============================================================================ +// implementation +// ============================================================================ + MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ), m_text(NULL), m_notebook(NULL) { - wxLayoutConstraints *c; - m_text = new wxTextCtrl(this, -1, "This is the log window.\n", wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE); - m_text->SetBackgroundColour("wheat"); + m_text->SetBackgroundColour(wxT("wheat")); - wxLog::AddTraceMask(_T("focus")); + if ( 0 ) + wxLog::AddTraceMask(_T("focus")); m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); m_notebook = new wxNotebook(this, ID_NOTEBOOK); @@ -444,7 +540,7 @@ 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("Couldn't load the image '%s' for the notebook page %d.", + wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."), s_iconNames[n], n); } } @@ -471,8 +567,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxPoint(10,90), wxSize(120,70), 5, choices, wxLB_SORT ); - SetControlClientData("listbox", m_listbox); - SetControlClientData("listbox", m_listboxSorted); + SetListboxClientData(wxT("listbox"), m_listbox); + SetListboxClientData(wxT("listbox"), m_listboxSorted); m_listbox->SetCursor(*wxCROSS_CURSOR); #if wxUSE_TOOLTIPS @@ -482,9 +578,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_LISTBOX_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); + (void)new MyButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); (void)new wxButton( panel, ID_LISTBOX_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); - wxButton *button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); + wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); button->SetDefault(); @@ -501,20 +597,20 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #endif // wxUSE_TOOLTIPS (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour", wxPoint(110,170) ); + panel->SetCursor(wxCursor(wxCURSOR_HAND)); m_notebook->AddPage(panel, "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), 5, choices, wxCB_SORT ); -#ifndef __WXMOTIF__ - SetControlClientData("choice", m_choice); - SetControlClientData("choice", m_choiceSorted); -#endif + SetChoiceClientData(wxT("choice"), m_choice); + SetChoiceClientData(wxT("choice"), m_choiceSorted); m_choice->SetSelection(2); - m_choice->SetBackgroundColour( "red" ); + m_choice->SetBackgroundColour( wxT("red") ); (void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); @@ -524,11 +620,16 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) ); m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice); +#endif // wxUSE_CHOICE panel = new wxPanel(m_notebook); (void)new wxStaticBox( panel, -1, "&Box around combobox", wxPoint(5, 5), wxSize(150, 100)); - m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,25), wxSize(120,-1), 5, choices, wxCB_READONLY ); + m_combo = new MyComboBox( panel, ID_COMBO, "This", + wxPoint(20,25), wxSize(120, -1), + 5, choices, + /* wxCB_READONLY | */ wxPROCESS_ENTER); + (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); @@ -547,7 +648,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) }; panel = new wxPanel(m_notebook); - (void)new wxRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS ); + (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS ); m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); #if wxUSE_TOOLTIPS @@ -566,15 +667,25 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); panel = new wxPanel(m_notebook); - (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(200,130) ); - m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30) ); - m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1), wxSL_LABELS ); - (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(220,10), wxSize(270,130) ); + (void)new wxStaticBox( panel, -1, "&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 ); + m_gauge->SetBackgroundColour(*wxGREEN); + m_gauge->SetForegroundColour(*wxRED); + m_gaugeVert = new wxGauge( panel, -1, 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->SetTickFreq(40, 0); + (void)new wxStaticBox( panel, -1, "&Explanation", + wxPoint(230,10), wxSize(270,130), + wxALIGN_CENTER ); + #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( (void)new wxStaticText( panel, -1, "Drag the slider!", - wxPoint(228,30), + wxPoint(250,30), wxSize(240, -1) ); #else @@ -585,7 +696,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) "\n" "This is also supposed to demonstrate how\n" "to use static controls.\n", - wxPoint(228,25), + wxPoint(250,25), wxSize(240, 110) ); #endif @@ -612,13 +723,13 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) panel = new wxPanel(m_notebook); -#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB - wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); +#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16. + wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION); wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10)); bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10)); - bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION)); + bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_QUESTION)); #endif // !Motif wxBitmap bitmap( 100, 100 ); @@ -630,36 +741,47 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) dc.DrawText("Bitmap", 30, 40); dc.SelectObject( wxNullBitmap ); - (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20)); + (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20)); #ifdef __WXMSW__ // test for masked bitmap display bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP); - bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); - (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120)); + if (bitmap.Ok()) + { + bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); + + (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120)); + } #endif - wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)), - bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)), - bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION)); + wxBitmap bmp1(wxArtProvider::GetBitmap(wxART_INFORMATION)), + bmp2(wxArtProvider::GetBitmap(wxART_WARNING)), + bmp3(wxArtProvider::GetBitmap(wxART_QUESTION)); wxBitmapButton *bmpBtn = new wxBitmapButton ( panel, -1, bmp1, - wxPoint(30, 50) + wxPoint(30, 70) ); + bmpBtn->SetBitmapSelected(bmp2); bmpBtn->SetBitmapFocus(bmp3); - (void)new wxButton(panel, ID_BUTTON_LABEL, "&Toggle label", wxPoint(250, 20)); +#if wxUSE_TOGGLEBTN + (void)new wxToggleButton(panel, ID_BUTTON_LABEL, + "&Toggle label", wxPoint(250, 20)); +#endif // wxUSE_TOGGLEBTN + m_label = new wxStaticText(panel, -1, "Label with some long text", wxPoint(250, 60), wxDefaultSize, - wxALIGN_RIGHT | wxST_NO_AUTORESIZE); + wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/); m_label->SetForegroundColour( *wxBLUE ); m_notebook->AddPage(panel, "wxBitmapXXX"); // layout constraints +#if wxUSE_CONSTRAINTS + wxLayoutConstraints *c; panel = new wxPanel(m_notebook); panel->SetAutoLayout( TRUE ); @@ -683,7 +805,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) pMyButton2->SetConstraints( c ); m_notebook->AddPage(panel, "wxLayoutConstraint"); - +#endif + // sizer panel = new wxPanel(m_notebook); @@ -693,7 +816,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 ); sizer->Add( 20,20, 1 ); - sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 ); + sizer->Add( new wxButton(panel, -1, "Multiline\nbutton" ), 3, wxGROW|wxALL, 10 ); panel->SetSizer( sizer ); @@ -719,7 +842,7 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event ) "page change from taking place - if you select\n" "[No] the current page will stay the third one\n", "Control sample", - wxICON_QUESTION | wxYES_NO) != wxYES ) + wxICON_QUESTION | wxYES_NO, this) != wxYES ) { event.Veto(); @@ -727,12 +850,16 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event ) } } - *m_text << "Notebook selection is being changed from " << selOld << "\n"; + *m_text << "Notebook selection is being changed from " << selOld + << " to " << event.GetSelection() + << " (current page from notebook is " + << m_notebook->GetSelection() << ")\n"; } void MyPanel::OnPageChanged( wxNotebookEvent &event ) { - *m_text << "Notebook selection is " << event.GetSelection() << "\n"; + *m_text << "Notebook selection is now " << event.GetSelection() + << " (from notebook: " << m_notebook->GetSelection() << ")\n"; } void MyPanel::OnTestButton(wxCommandEvent& event) @@ -741,6 +868,11 @@ void MyPanel::OnTestButton(wxCommandEvent& event) event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2')); } +void MyPanel::OnBmpButton(wxCommandEvent& event) +{ + wxLogMessage(_T("Bitmap button clicked.")); +} + void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) { static wxColour s_colOld; @@ -751,16 +883,16 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event)) SetBackgroundColour(s_colOld); s_colOld = wxNullColour; - m_lbSelectThis->SetForegroundColour("red"); - m_lbSelectThis->SetBackgroundColour("white"); + m_lbSelectThis->SetForegroundColour(wxT("red")); + m_lbSelectThis->SetBackgroundColour(wxT("white")); } else { - s_colOld = wxColour("red"); - SetBackgroundColour("white"); + s_colOld = wxColour(wxT("red")); + SetBackgroundColour(wxT("white")); - m_lbSelectThis->SetForegroundColour("white"); - m_lbSelectThis->SetBackgroundColour("red"); + m_lbSelectThis->SetForegroundColour(wxT("white")); + m_lbSelectThis->SetBackgroundColour(wxT("red")); } m_lbSelectThis->Refresh(); @@ -818,8 +950,8 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) case ID_LISTBOX_ENABLE: { m_text->AppendText("Checkbox clicked.\n"); - wxCheckBox *cb = (wxCheckBox*)event.GetEventObject(); #if wxUSE_TOOLTIPS + wxCheckBox *cb = (wxCheckBox*)event.GetEventObject(); if (event.GetInt()) cb->SetToolTip( "Click to enable listbox" ); else @@ -829,6 +961,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) m_lbSelectThis->Enable( event.GetInt() == 0 ); m_lbSelectNum->Enable( event.GetInt() == 0 ); m_listboxSorted->Enable( event.GetInt() == 0 ); + FindWindow(ID_CHANGE_COLOUR)->Enable( event.GetInt() == 0 ); break; } case ID_LISTBOX_SEL_NUM: @@ -861,9 +994,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) { int idx; idx = m_listbox->GetSelection(); - m_listbox->Delete( idx ); + if ( idx != wxNOT_FOUND ) + m_listbox->Delete( idx ); idx = m_listboxSorted->GetSelection(); - m_listboxSorted->Delete( idx ); + if ( idx != wxNOT_FOUND ) + m_listboxSorted->Delete( idx ); break; } case ID_LISTBOX_FONT: @@ -876,6 +1011,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) } } +#if wxUSE_CHOICE void MyPanel::OnChoice( wxCommandEvent &event ) { wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice @@ -944,9 +1080,11 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) case ID_CHOICE_DELETE: { int idx = m_choice->GetSelection(); - m_choice->Delete( idx ); + if ( idx != wxNOT_FOUND ) + m_choice->Delete( idx ); idx = m_choiceSorted->GetSelection(); - m_choiceSorted->Delete( idx ); + if ( idx != wxNOT_FOUND ) + m_choiceSorted->Delete( idx ); break; } case ID_CHOICE_FONT: @@ -957,6 +1095,7 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) } } } +#endif // wxUSE_CHOICE void MyPanel::OnCombo( wxCommandEvent &event ) { @@ -968,6 +1107,18 @@ void MyPanel::OnCombo( wxCommandEvent &event ) m_text->AppendText( "\n" ); } +void MyPanel::OnComboTextChanged(wxCommandEvent& WXUNUSED(event)) +{ + wxLogMessage(_T("Text in the combobox changed: now is '%s'."), + m_combo->GetValue().c_str()); +} + +void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event)) +{ + wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."), + m_combo->GetValue().c_str()); +} + void MyPanel::OnComboButtons( wxCommandEvent &event ) { switch (event.GetId()) @@ -1051,17 +1202,16 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) ) m_text->SetFont( *wxITALIC_FONT ); } -void MyPanel::OnUpdateLabel( wxCommandEvent &WXUNUSED(event) ) +void MyPanel::OnUpdateLabel( wxCommandEvent &event ) { - static bool s_long = TRUE; - - s_long = !s_long; - m_label->SetLabel(s_long ? "very very very long text" : "shorter text"); + m_label->SetLabel(event.GetInt() ? "Very very very very very long text." + : "Shorter text."); } void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) { m_gauge->SetValue( m_slider->GetValue() ); + m_gaugeVert->SetValue( m_slider->GetValue() / 2 ); } #if wxUSE_SPINCTRL @@ -1130,11 +1280,19 @@ 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("Progress dialog example", "An informative message", max, // range this, // parent wxPD_CAN_ABORT | + wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | @@ -1142,16 +1300,16 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) bool cont = TRUE; - for ( int i = 0; i < max && cont; i++ ) + for ( int i = 0; i <= max && cont; i++ ) { wxSleep(1); - if ( i == max - 1 ) + if ( i == max ) { cont = dialog.Update(i, "That's all, folks!"); } else if ( i == max / 2 ) { - cont = dialog.Update(i, "Only a half left!"); + cont = dialog.Update(i, "Only a half left (very long message)!"); } else { @@ -1200,12 +1358,48 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_IDLE(MyFrame::OnIdle) END_EVENT_TABLE() -MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h) -: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) +MyFrame::MyFrame(const char *title, int x, int y) + : wxFrame(NULL, -1, 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 + + SetIcon( wxICON(mondrian) ); + + wxMenu *file_menu = new wxMenu; + + file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L"); + file_menu->AppendSeparator(); + file_menu->Append(CONTROLS_ABOUT, "&About\tF1"); + file_menu->AppendSeparator(); + file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample"); + + wxMenuBar *menu_bar = new wxMenuBar; + menu_bar->Append(file_menu, "&File"); + +#if wxUSE_TOOLTIPS + wxMenu *tooltip_menu = new wxMenu; + tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); + tooltip_menu->AppendSeparator(); + tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", + "enable/disable tooltips", TRUE); + tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE); + menu_bar->Append(tooltip_menu, "&Tooltips"); +#endif // wxUSE_TOOLTIPS + + wxMenu *panel_menu = new wxMenu; + panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E", + "Enable/disable all panel controls", TRUE); + menu_bar->Append(panel_menu, "&Panel"); + + SetMenuBar(menu_bar); + CreateStatusBar(2); m_panel = new MyPanel( this, 10, 10, 300, 100 ); + + SetSizeHints( 500, 425 ); } void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) @@ -1215,12 +1409,10 @@ void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) ) { - wxBeginBusyCursor(); + wxBusyCursor bc; wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK ); dialog.ShowModal(); - - wxEndBusyCursor(); } void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event)) @@ -1310,14 +1502,53 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) } } -static void SetControlClientData(const char *name, - wxControlWithItems *control) +void MyComboBox::OnChar(wxKeyEvent& event) +{ + wxLogMessage(_T("MyComboBox::OnChar")); + + if ( event.KeyCode() == 'w' ) + wxLogMessage(_T("MyComboBox: 'w' will be ignored.")); + else + event.Skip(); +} + +void MyComboBox::OnKeyDown(wxKeyEvent& event) +{ + wxLogMessage(_T("MyComboBox::OnKeyDown")); + + if ( event.KeyCode() == 'w' ) + wxLogMessage(_T("MyComboBox: 'w' will be ignored.")); + else + event.Skip(); +} + +void MyComboBox::OnKeyUp(wxKeyEvent& event) +{ + wxLogMessage(_T("MyComboBox::OnKeyUp")); + + event.Skip(); +} + +static void SetListboxClientData(const wxChar *name, wxListBox *control) +{ + size_t count = control->GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxString s; + s.Printf(wxT("%s client data for '%s'"), + name, control->GetString(n).c_str()); + + control->SetClientObject(n, new wxStringClientData(s)); + } +} + +static void SetChoiceClientData(const wxChar *name, wxChoice *control) { size_t count = control->GetCount(); for ( size_t n = 0; n < count; n++ ) { wxString s; - s.Printf("%s client data for '%s'", + s.Printf(wxT("%s client data for '%s'"), name, control->GetString(n).c_str()); control->SetClientObject(n, new wxStringClientData(s));