X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b782f2e0f6abc7baa9a8bfc158847a89d5d12145..b698c8e9bfbcf149f8ac375ea5b5ff6af9cba86a:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index e14e8215e1..bb4c790817 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -26,6 +26,7 @@ #if !defined( __WXMSW__ ) || defined( __WIN95__ ) #include "wx/spinbutt.h" #endif +#include "wx/tglbtn.h" #include "wx/notebook.h" #include "wx/imaglist.h" @@ -49,19 +50,18 @@ #ifdef __WIN16__ // Win16 doesn't have them - #undef wxUSE_SPINBUTTON - #define wxUSE_SPINBUTTON 0 + #ifdef wxUSE_SPINBTN + #undef wxUSE_SPINBTN + #endif + #define wxUSE_SPINBTN 0 #else - #if !defined(wxUSE_SPINBUTTON) - #define wxUSE_SPINBUTTON 1 + #ifndef wxUSE_SPINBTN + #define wxUSE_SPINBTN 1 #endif #endif // __WIN16__ #include "wx/progdlg.h" -// VZ: this is a temp. hack, will remove soon -#define wxUSE_SPINCTRL 1 - #if wxUSE_SPINCTRL #include "wx/spinctrl.h" #endif // wxUSE_SPINCTRL @@ -89,6 +89,8 @@ public: void OnChoice( wxCommandEvent &event ); void OnChoiceButtons( wxCommandEvent &event ); void OnCombo( wxCommandEvent &event ); + void OnComboTextChanged( wxCommandEvent &event ); + void OnComboTextEnter( wxCommandEvent &event ); void OnComboButtons( wxCommandEvent &event ); void OnRadio( wxCommandEvent &event ); void OnRadioButtons( wxCommandEvent &event ); @@ -96,27 +98,40 @@ public: void OnPageChanged( wxNotebookEvent &event ); void OnPageChanging( wxNotebookEvent &event ); void OnSliderUpdate( wxCommandEvent &event ); -#if wxUSE_SPINBUTTON + void OnUpdateLabel( wxCommandEvent &event ); +#if wxUSE_SPINBTN void OnSpinUp( wxSpinEvent &event ); void OnSpinDown( wxSpinEvent &event ); void OnSpinUpdate( wxSpinEvent &event ); void OnUpdateShowProgress( wxUpdateUIEvent& event ); void OnShowProgress( wxCommandEvent &event ); -#endif // wxUSE_SPINBUTTON +#endif // wxUSE_SPINBTN - wxListBox *m_listbox; - wxChoice *m_choice; +#if wxUSE_SPINCTRL + void OnSpinCtrl(wxSpinEvent& event); +#endif // wxUSE_SPINCTRL + + void OnEnableAll(wxCommandEvent& event); + void OnChangeColour(wxCommandEvent& event); + void OnTestButton(wxCommandEvent& event); + void OnBmpButton(wxCommandEvent& event); + + wxListBox *m_listbox, + *m_listboxSorted; + wxChoice *m_choice, + *m_choiceSorted; wxComboBox *m_combo; wxRadioBox *m_radio; - wxGauge *m_gauge; + wxGauge *m_gauge, + *m_gaugeVert; wxSlider *m_slider; wxButton *m_fontButton; wxButton *m_lbSelectNum; wxButton *m_lbSelectThis; -#if wxUSE_SPINBUTTON +#if wxUSE_SPINBTN wxSpinButton *m_spinbutton; wxButton *m_btnProgress; -#endif // wxUSE_SPINBUTTON +#endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL wxSpinCtrl *m_spinctrl; @@ -128,7 +143,11 @@ public: wxTextCtrl *m_text; wxNotebook *m_notebook; + wxStaticText *m_label; + private: + wxLog *m_logTargetOld; + DECLARE_EVENT_TABLE() }; @@ -139,21 +158,135 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnClearLog(wxCommandEvent& event); + #if wxUSE_TOOLTIPS void OnSetTooltipDelay(wxCommandEvent& event); void OnToggleTooltips(wxCommandEvent& event); #endif // wxUSE_TOOLTIPS + + void OnEnableAll(wxCommandEvent& event); + void OnIdle( wxIdleEvent& event ); void OnSize( wxSizeEvent& event ); + void OnMove( wxMoveEvent& event ); + + MyPanel *GetPanel() const { return m_panel; } + +private: + void UpdateStatusBar(const wxPoint& pos, const wxSize& size) + { + wxString msg; + wxSize sizeCl = GetClientSize(); + msg.Printf(_("pos=(%d, %d), size=%dx%d (client=%dx%d)"), + pos.x, pos.y, + size.x, size.y, + sizeCl.x, sizeCl.y); + SetStatusText(msg, 1); + } + + MyPanel *m_panel; + + 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() }; //---------------------------------------------------------------------- -// main() +// other //---------------------------------------------------------------------- +static void SetControlClientData(const char *name, + wxControlWithItems *control); + IMPLEMENT_APP(MyApp) //---------------------------------------------------------------------- @@ -162,21 +295,36 @@ IMPLEMENT_APP(MyApp) enum { - MINIMAL_QUIT = 100, - MINIMAL_TEXT, - MINIMAL_ABOUT, + CONTROLS_QUIT = 100, + CONTROLS_TEXT, + CONTROLS_ABOUT, + CONTROLS_CLEAR_LOG, // tooltip menu - MINIMAL_SET_TOOLTIP_DELAY = 200, - MINIMAL_ENABLE_TOOLTIPS + CONTROLS_SET_TOOLTIP_DELAY = 200, + CONTROLS_ENABLE_TOOLTIPS, + + // panel menu + CONTROLS_ENABLE_ALL }; bool MyApp::OnInit() { + // parse the cmd line + int x = 50, + y = 50; + if ( argc == 3 ) + { + wxSscanf(argv[1], "%d", &x); + wxSscanf(argv[2], "%d", &y); + } + // Create the main frame window MyFrame *frame = new MyFrame((wxFrame *) NULL, "Controls wxWindows App", - 50, 50, 530, 420); + x, y, 540, 430); + + frame->SetSizeHints( 500, 425 ); // Give it an icon // The wxICON() macros loads an icon from a resource under Windows @@ -184,27 +332,37 @@ bool MyApp::OnInit() frame->SetIcon( wxICON(mondrian) ); - wxMenu *file_menu = new wxMenu("", wxMENU_TEAROFF ); - file_menu->Append(MINIMAL_ABOUT, "&About\tF1"); - file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample"); + 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(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); + tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); tooltip_menu->AppendSeparator(); - tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCrtl-T", + tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", "enable/disable tooltips", TRUE); - tooltip_menu->Check(MINIMAL_ENABLE_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); frame->Show(TRUE); - frame->SetCursor(wxCursor(wxCURSOR_HAND)); + + //frame->GetPanel()->m_notebook->SetSelection(6); SetTopWindow(frame); @@ -225,6 +383,7 @@ const int ID_LISTBOX_APPEND = 134; const int ID_LISTBOX_DELETE = 135; const int ID_LISTBOX_FONT = 136; const int ID_LISTBOX_ENABLE = 137; +const int ID_LISTBOX_SORTED = 138; const int ID_CHOICE = 120; const int ID_CHOICE_SEL_NUM = 121; @@ -234,6 +393,7 @@ const int ID_CHOICE_APPEND = 124; const int ID_CHOICE_DELETE = 125; const int ID_CHOICE_FONT = 126; const int ID_CHOICE_ENABLE = 127; +const int ID_CHOICE_SORTED = 128; const int ID_COMBO = 140; const int ID_COMBO_SEL_NUM = 141; @@ -260,12 +420,21 @@ const int ID_SLIDER = 181; const int ID_SPIN = 182; const int ID_BTNPROGRESS = 183; +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_CHANGE_COLOUR = 200; 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_LISTBOX (ID_LISTBOX, MyPanel::OnListBox) +EVT_LISTBOX (ID_LISTBOX_SORTED, MyPanel::OnListBox) EVT_LISTBOX_DCLICK(ID_LISTBOX, MyPanel::OnListBoxDoubleClick) EVT_BUTTON (ID_LISTBOX_SEL_NUM, MyPanel::OnListBoxButtons) EVT_BUTTON (ID_LISTBOX_SEL_STR, MyPanel::OnListBoxButtons) @@ -275,6 +444,7 @@ EVT_BUTTON (ID_LISTBOX_DELETE, MyPanel::OnListBoxButtons) EVT_BUTTON (ID_LISTBOX_FONT, MyPanel::OnListBoxButtons) EVT_CHECKBOX (ID_LISTBOX_ENABLE, MyPanel::OnListBoxButtons) EVT_CHOICE (ID_CHOICE, MyPanel::OnChoice) +EVT_CHOICE (ID_CHOICE_SORTED, MyPanel::OnChoice) EVT_BUTTON (ID_CHOICE_SEL_NUM, MyPanel::OnChoiceButtons) EVT_BUTTON (ID_CHOICE_SEL_STR, MyPanel::OnChoiceButtons) EVT_BUTTON (ID_CHOICE_CLEAR, MyPanel::OnChoiceButtons) @@ -283,6 +453,8 @@ EVT_BUTTON (ID_CHOICE_DELETE, MyPanel::OnChoiceButtons) EVT_BUTTON (ID_CHOICE_FONT, MyPanel::OnChoiceButtons) EVT_CHECKBOX (ID_CHOICE_ENABLE, MyPanel::OnChoiceButtons) 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) @@ -297,27 +469,61 @@ EVT_BUTTON (ID_RADIOBOX_FONT, MyPanel::OnRadioButtons) EVT_CHECKBOX (ID_RADIOBOX_ENABLE, MyPanel::OnRadioButtons) EVT_BUTTON (ID_SET_FONT, MyPanel::OnSetFont) EVT_SLIDER (ID_SLIDER, MyPanel::OnSliderUpdate) -#if wxUSE_SPINBUTTON +#if wxUSE_SPINBTN EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate) EVT_SPIN_UP (ID_SPIN, MyPanel::OnSpinUp) EVT_SPIN_DOWN (ID_SPIN, MyPanel::OnSpinDown) EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress) EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress) -#endif +#endif // wxUSE_SPINBTN +#if wxUSE_SPINCTRL +EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl) +#endif // wxUSE_SPINCTRL +#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) { - // SetBackgroundColour("cadet blue"); + wxLayoutConstraints *c; - m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE ); - // m_text->SetBackgroundColour("wheat"); + m_text = new wxTextCtrl(this, -1, "This is the log window.\n", + wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE); + m_text->SetBackgroundColour("wheat"); - delete wxLog::SetActiveTarget(new wxLogStderr); + if ( 0 ) + wxLog::AddTraceMask(_T("focus")); + m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text)); - m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) ); + m_notebook = new wxNotebook(this, ID_NOTEBOOK); wxString choices[] = { @@ -382,56 +588,82 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) #endif - wxButton *button = (wxButton*) NULL; /* who did this ? */ - wxPanel *panel = (wxPanel*) NULL; + wxPanel *panel = new wxPanel(m_notebook); + m_listbox = new wxListBox( panel, ID_LISTBOX, + wxPoint(10,10), wxSize(120,70), + 5, choices, wxLB_ALWAYS_SB ); + m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED, + wxPoint(10,90), wxSize(120,70), + 5, choices, wxLB_SORT ); + + SetControlClientData("listbox", m_listbox); + SetControlClientData("listbox", m_listboxSorted); - panel = new wxPanel(m_notebook); - m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices, wxLB_ALWAYS_SB ); m_listbox->SetCursor(*wxCROSS_CURSOR); #if wxUSE_TOOLTIPS m_listbox->SetToolTip( "This is a list box" ); #endif // wxUSE_TOOLTIPS - 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 wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) ); - button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); + 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 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 MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); + + button->SetDefault(); + + button->SetForegroundColour(*wxBLUE); + #if wxUSE_TOOLTIPS button->SetToolTip( "Press here to set italic font" ); #endif // wxUSE_TOOLTIPS - m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,130) ); + m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,170) ); m_checkbox->SetValue(FALSE); #if wxUSE_TOOLTIPS m_checkbox->SetToolTip( "Click here to disable the listbox" ); #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); 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 ); + + SetControlClientData("choice", m_choice); + SetControlClientData("choice", m_choiceSorted); + m_choice->SetSelection(2); m_choice->SetBackgroundColour( "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) ); - (void)new wxButton( panel, ID_CHOICE_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) ); - (void)new wxButton( panel, ID_CHOICE_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) ); - (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) ); + (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) ); + (void)new wxButton( panel, ID_CHOICE_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); + (void)new wxButton( panel, ID_CHOICE_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); + (void)new wxButton( panel, ID_CHOICE_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); + (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) ); m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice); panel = new wxPanel(m_notebook); - m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(10,10), wxSize(120,-1), 5, choices, wxCB_READONLY ); - (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) ); - (void)new wxButton( panel, ID_COMBO_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) ); - (void)new wxButton( panel, ID_COMBO_FONT, "Set Italic font", wxPoint(340,130), wxSize(140,30) ); - (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) ); + (void)new wxStaticBox( panel, -1, "&Box around combobox", + wxPoint(5, 5), wxSize(150, 100)); + 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) ); + (void)new wxButton( panel, ID_COMBO_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); + (void)new wxButton( panel, ID_COMBO_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); + (void)new wxButton( panel, ID_COMBO_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); + (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) ); m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo); wxString choices2[] = @@ -443,28 +675,41 @@ 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 ); - m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); - (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) ); - m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) ); - (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) ); - wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP ); + (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 + m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?"); + m_radio->SetToolTip("Ever seen a radiobox?"); +#endif // wxUSE_TOOLTIPS + + (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); + (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) ); + m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) ); + (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) ); + (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize ); + wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP ); rb->SetValue( FALSE ); - (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) ); + (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize ); 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) ); #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 @@ -475,7 +720,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 @@ -483,17 +728,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxString s; s << initialSpinValue; m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) ); -#if wxUSE_SPINBUTTON - m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(80, -1) ); +#if wxUSE_SPINBTN + m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) ); m_spinbutton->SetRange(-10,30); m_spinbutton->SetValue(initialSpinValue); - m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog", - wxPoint(408, 159) ); -#endif // wxUSE_SPINBUTTON + m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog", + wxPoint(300, 160) ); +#endif // wxUSE_SPINBTN #if wxUSE_SPINCTRL - m_spinctrl = new wxSpinCtrl( panel, -1, wxPoint(200, 159), wxSize(80, 20) ); + m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, "", wxPoint(200, 160), wxSize(80, -1) ); m_spinctrl->SetRange(10,30); m_spinctrl->SetValue(15); #endif // wxUSE_SPINCTRL @@ -502,9 +747,10 @@ 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 +#if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16. wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); - wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10)); + 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)); @@ -514,22 +760,87 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxMemoryDC dc; dc.SelectObject( bitmap ); dc.SetPen(*wxGREEN_PEN); + dc.Clear(); dc.DrawEllipse(5, 5, 90, 90); - dc.DrawText("Bitmap", 20, 20); + dc.DrawText("Bitmap", 30, 40); dc.SelectObject( wxNullBitmap ); + (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); + 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)); wxBitmapButton *bmpBtn = new wxBitmapButton ( - panel, - -1, - bitmap, - wxPoint(100, 20) + panel, -1, + bmp1, + wxPoint(30, 70) ); - bmpBtn = NULL; // suppress warning + bmpBtn->SetBitmapSelected(bmp2); + bmpBtn->SetBitmapFocus(bmp3); - new wxButton(panel, -1, "Another button", 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*/); + m_label->SetForegroundColour( *wxBLUE ); m_notebook->AddPage(panel, "wxBitmapXXX"); + + // layout constraints + + 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, "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 ); + + wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" ); + pMyButton2->SetConstraints( c ); + + m_notebook->AddPage(panel, "wxLayoutConstraint"); + + // sizer + + panel = new wxPanel(m_notebook); + panel->SetAutoLayout( TRUE ); + + wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); + + 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 ); + + panel->SetSizer( sizer ); + + m_notebook->AddPage(panel, "wxSizer"); } void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) @@ -551,7 +862,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(); @@ -559,22 +870,90 @@ 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) +{ + wxLogMessage(_T("Button %c clicked."), + 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; + + // test panel colour changing and propagation to the subcontrols + if ( s_colOld.Ok() ) + { + SetBackgroundColour(s_colOld); + s_colOld = wxNullColour; + + m_lbSelectThis->SetForegroundColour("red"); + m_lbSelectThis->SetBackgroundColour("white"); + } + else + { + s_colOld = wxColour("red"); + SetBackgroundColour("white"); + + m_lbSelectThis->SetForegroundColour("white"); + m_lbSelectThis->SetBackgroundColour("red"); + } + + m_lbSelectThis->Refresh(); + Refresh(); } void MyPanel::OnListBox( wxCommandEvent &event ) { - m_text->AppendText( "ListBox event selection string is: " ); +// GetParent()->Move(100, 100); + + if (event.GetInt() == -1) + { + m_text->AppendText( "ListBox has no selections anymore\n" ); + return; + } + + wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox + : m_listboxSorted; + + m_text->AppendText( "ListBox event selection string is: '" ); m_text->AppendText( event.GetString() ); - m_text->AppendText( "\n" ); - m_text->AppendText( "ListBox control selection string is: " ); - m_text->AppendText( m_listbox->GetStringSelection() ); - m_text->AppendText( "\n" ); + m_text->AppendText( "'\n" ); + m_text->AppendText( "ListBox control selection string is: '" ); + m_text->AppendText( listbox->GetStringSelection() ); + m_text->AppendText( "'\n" ); + + wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject()); + m_text->AppendText( "ListBox event client data string is: '" ); + if (obj) // BC++ doesn't like use of '? .. : .. ' in this context + m_text->AppendText( obj->GetData() ); + else + m_text->AppendText( wxString("none") ); + + m_text->AppendText( "'\n" ); + m_text->AppendText( "ListBox control client data string is: '" ); + obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection()); + if (obj) + m_text->AppendText( obj->GetData() ); + else + m_text->AppendText( wxString("none") ); + m_text->AppendText( "'\n" ); } void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event ) @@ -599,39 +978,53 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) cb->SetToolTip( "Click to disable listbox" ); #endif // wxUSE_TOOLTIPS m_listbox->Enable( event.GetInt() == 0 ); + 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: { m_listbox->SetSelection( 2 ); + m_listboxSorted->SetSelection( 2 ); m_lbSelectThis->WarpPointer( 40, 14 ); break; } case ID_LISTBOX_SEL_STR: { m_listbox->SetStringSelection( "This" ); + m_listboxSorted->SetStringSelection( "This" ); m_lbSelectNum->WarpPointer( 40, 14 ); break; } case ID_LISTBOX_CLEAR: { m_listbox->Clear(); + m_listboxSorted->Clear(); break; } case ID_LISTBOX_APPEND: { m_listbox->Append( "Hi!" ); + m_listboxSorted->Append( "Hi!" ); break; } case ID_LISTBOX_DELETE: { - int idx = m_listbox->GetSelection(); - m_listbox->Delete( idx ); + int idx; + idx = m_listbox->GetSelection(); + if ( idx != wxNOT_FOUND ) + m_listbox->Delete( idx ); + idx = m_listboxSorted->GetSelection(); + if ( idx != wxNOT_FOUND ) + m_listboxSorted->Delete( idx ); break; } case ID_LISTBOX_FONT: { m_listbox->SetFont( *wxITALIC_FONT ); + m_listboxSorted->SetFont( *wxITALIC_FONT ); m_checkbox->SetFont( *wxITALIC_FONT ); break; } @@ -640,12 +1033,33 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) void MyPanel::OnChoice( wxCommandEvent &event ) { - m_text->AppendText( "Choice event selection string is: " ); + wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice + : m_choiceSorted; + + m_text->AppendText( "Choice event selection string is: '" ); m_text->AppendText( event.GetString() ); - m_text->AppendText( "\n" ); - m_text->AppendText( "Choice control selection string is: " ); - m_text->AppendText( m_choice->GetStringSelection() ); - m_text->AppendText( "\n" ); + m_text->AppendText( "'\n" ); + m_text->AppendText( "Choice control selection string is: '" ); + m_text->AppendText( choice->GetStringSelection() ); + m_text->AppendText( "'\n" ); + + wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject()); + m_text->AppendText( "Choice event client data string is: '" ); + + if (obj) + m_text->AppendText( obj->GetData() ); + else + m_text->AppendText( wxString("none") ); + + m_text->AppendText( "'\n" ); + m_text->AppendText( "Choice control client data string is: '" ); + obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection()); + + if (obj) + m_text->AppendText( obj->GetData() ); + else + m_text->AppendText( wxString("none") ); + m_text->AppendText( "'\n" ); } void MyPanel::OnChoiceButtons( wxCommandEvent &event ) @@ -655,37 +1069,47 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) case ID_CHOICE_ENABLE: { m_choice->Enable( event.GetInt() == 0 ); + m_choiceSorted->Enable( event.GetInt() == 0 ); break; } case ID_CHOICE_SEL_NUM: { m_choice->SetSelection( 2 ); + m_choiceSorted->SetSelection( 2 ); break; } case ID_CHOICE_SEL_STR: { m_choice->SetStringSelection( "This" ); + m_choiceSorted->SetStringSelection( "This" ); break; } case ID_CHOICE_CLEAR: { m_choice->Clear(); + m_choiceSorted->Clear(); break; } case ID_CHOICE_APPEND: { m_choice->Append( "Hi!" ); + m_choiceSorted->Append( "Hi!" ); break; } 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(); + if ( idx != wxNOT_FOUND ) + m_choiceSorted->Delete( idx ); break; } case ID_CHOICE_FONT: { m_choice->SetFont( *wxITALIC_FONT ); + m_choiceSorted->SetFont( *wxITALIC_FONT ); break; } } @@ -701,6 +1125,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()) @@ -784,12 +1220,31 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) ) m_text->SetFont( *wxITALIC_FONT ); } +void MyPanel::OnUpdateLabel( wxCommandEvent &event ) +{ + 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_SPINBUTTON +#if wxUSE_SPINCTRL + +void MyPanel::OnSpinCtrl(wxSpinEvent& event) +{ + wxString s; + s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"), + m_spinctrl->GetValue(), event.GetInt()); + m_text->AppendText(s); +} + +#endif // wxUSE_SPINCTRL + +#if wxUSE_SPINBTN void MyPanel::OnSpinUp( wxSpinEvent &event ) { wxString value; @@ -848,6 +1303,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) max, // range this, // parent wxPD_CAN_ABORT | + wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | @@ -855,16 +1311,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 { @@ -882,10 +1338,13 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) } } -#endif // wxUSE_SPINBUTTON +#endif // wxUSE_SPINBTN MyPanel::~MyPanel() { + //wxLog::RemoveTraceMask(_T("focus")); + delete wxLog::SetActiveTarget(m_logTargetOld); + delete m_notebook->GetImageList(); } @@ -894,14 +1353,20 @@ MyPanel::~MyPanel() //---------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxFrame) -EVT_MENU(MINIMAL_QUIT, MyFrame::OnQuit) -EVT_MENU(MINIMAL_ABOUT, MyFrame::OnAbout) + EVT_MENU(CONTROLS_QUIT, MyFrame::OnQuit) + EVT_MENU(CONTROLS_ABOUT, MyFrame::OnAbout) + EVT_MENU(CONTROLS_CLEAR_LOG, MyFrame::OnClearLog) #if wxUSE_TOOLTIPS -EVT_MENU(MINIMAL_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay) -EVT_MENU(MINIMAL_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips) + EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY, MyFrame::OnSetTooltipDelay) + EVT_MENU(CONTROLS_ENABLE_TOOLTIPS, MyFrame::OnToggleTooltips) #endif // wxUSE_TOOLTIPS -EVT_SIZE(MyFrame::OnSize) -EVT_IDLE(MyFrame::OnIdle) + + EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll) + + EVT_SIZE(MyFrame::OnSize) + EVT_MOVE(MyFrame::OnMove) + + EVT_IDLE(MyFrame::OnIdle) END_EVENT_TABLE() MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h) @@ -909,7 +1374,7 @@ MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h) { CreateStatusBar(2); - (void)new MyPanel( this, 10, 10, 300, 100 ); + m_panel = new MyPanel( this, 10, 10, 300, 100 ); } void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) ) @@ -919,12 +1384,15 @@ 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)) +{ + m_panel->m_text->Clear(); } #if wxUSE_TOOLTIPS @@ -961,11 +1429,24 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event) } #endif // tooltips +void MyFrame::OnEnableAll(wxCommandEvent& WXUNUSED(event)) +{ + static bool s_enable = TRUE; + + s_enable = !s_enable; + m_panel->Enable(s_enable); +} + +void MyFrame::OnMove( wxMoveEvent& event ) +{ + UpdateStatusBar(event.GetPosition(), GetSize()); + + event.Skip(); +} + void MyFrame::OnSize( wxSizeEvent& event ) { - wxString msg; - msg.Printf( _("%dx%d"), event.GetSize().x, event.GetSize().y); - SetStatusText(msg, 1); + UpdateStatusBar(GetPosition(), event.GetSize()); event.Skip(); } @@ -982,11 +1463,11 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) wxString msg; msg.Printf( #ifdef __WXMSW__ - _T("Focus: wxWindow = %p, HWND = %08x"), + _T("Focus: %s, HWND = %08x"), #else - _T("Focus: wxWindow = %p"), + _T("Focus: %s"), #endif - s_windowFocus + s_windowFocus->GetClassInfo()->GetClassName() #ifdef __WXMSW__ , s_windowFocus->GetHWND() #endif @@ -995,3 +1476,44 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) SetStatusText(msg); } } + +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 SetControlClientData(const char *name, + wxControlWithItems *control) +{ + size_t count = control->GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + wxString s; + s.Printf("%s client data for '%s'", + name, control->GetString(n).c_str()); + + control->SetClientObject(n, new wxStringClientData(s)); + } +}