X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17867d61dcd061d3f39872446bc00c63d8a2a815..9a98a85452729f479bad8538738ee899a0b1aa34:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index e26ce2d35f..c6c8d0f96c 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -51,6 +51,14 @@ #include "icons/gauge.xpm" #endif +#ifdef __WIN16__ + // Win16 doesn't have them + #undef wxUSE_SPINBUTTON + #define wxUSE_SPINBUTTON 0 +#endif // __WIN16__ + +#include "wx/progdlg.h" + //---------------------------------------------------------------------- // class definitions //---------------------------------------------------------------------- @@ -71,8 +79,13 @@ public: : wxTextCtrl(parent, id, value, pos, size, style) { } void OnKeyDown(wxKeyEvent& event); + void OnKeyUp(wxKeyEvent& event); + void OnChar(wxKeyEvent& event); private: + static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); } + void LogEvent(const wxChar *name, wxKeyEvent& event) const; + DECLARE_EVENT_TABLE() }; @@ -94,10 +107,13 @@ public: void OnRadioButtons( wxCommandEvent &event ); void OnSetFont( wxCommandEvent &event ); void OnPageChanged( wxNotebookEvent &event ); + void OnPageChanging( wxNotebookEvent &event ); void OnSliderUpdate( wxCommandEvent &event ); -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON void OnSpinUpdate( wxSpinEvent &event ); -#endif + void OnUpdateShowProgress( wxUpdateUIEvent& event ); + void OnShowProgress( wxCommandEvent &event ); +#endif // wxUSE_SPINBUTTON void OnPasteFromClipboard( wxCommandEvent &event ); void OnCopyToClipboard( wxCommandEvent &event ); void OnMoveToEndOfText( wxCommandEvent &event ); @@ -110,8 +126,11 @@ public: wxGauge *m_gauge; wxSlider *m_slider; wxButton *m_fontButton; -#ifndef __WIN16__ + wxButton *m_lbSelectNum; + wxButton *m_lbSelectThis; +#ifndef wxUSE_SPINBUTTON wxSpinButton *m_spinbutton; + wxButton *m_btnProgress; #endif wxTextCtrl *m_spintext; MyTextCtrl *m_multitext; @@ -178,17 +197,17 @@ bool MyApp::OnInit() frame->SetIcon( wxICON(mondrian) ); wxMenu *file_menu = new wxMenu; - file_menu->Append(MINIMAL_ABOUT, "&About"); - file_menu->Append(MINIMAL_QUIT, "E&xit"); + file_menu->Append(MINIMAL_ABOUT, "&About\tF1"); + file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample"); - wxMenuBar *menu_bar = new wxMenuBar; + wxMenuBar *menu_bar = new wxMenuBar( wxMB_DOCKABLE ); menu_bar->Append(file_menu, "&File"); #if wxUSE_TOOLTIPS wxMenu *tooltip_menu = new wxMenu; - tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay"); + tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); tooltip_menu->AppendSeparator(); - tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips", + tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCrtl-T", "enable/disable tooltips", TRUE); tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE); menu_bar->Append(tooltip_menu, "&Tooltips"); @@ -209,9 +228,152 @@ bool MyApp::OnInit() //---------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) -EVT_KEY_DOWN(MyTextCtrl::OnKeyDown) + EVT_KEY_DOWN(MyTextCtrl::OnKeyDown) + EVT_KEY_UP(MyTextCtrl::OnKeyUp) + EVT_CHAR(MyTextCtrl::OnChar) END_EVENT_TABLE() +void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const +{ + wxString key; + long keycode = event.KeyCode(); + if ( wxIsprint((int)keycode) ) + key.Printf( _T("'%c'") , (char)keycode); + else + { + switch ( keycode ) + { + case WXK_BACK: key = "BACK"; break; + case WXK_TAB: key = "TAB"; break; + case WXK_RETURN: key = "RETURN"; break; + case WXK_ESCAPE: key = "ESCAPE"; break; + case WXK_SPACE: key = "SPACE"; break; + case WXK_DELETE: key = "DELETE"; break; + case WXK_START: key = "START"; break; + case WXK_LBUTTON: key = "LBUTTON"; break; + case WXK_RBUTTON: key = "RBUTTON"; break; + case WXK_CANCEL: key = "CANCEL"; break; + case WXK_MBUTTON: key = "MBUTTON"; break; + case WXK_CLEAR: key = "CLEAR"; break; + case WXK_SHIFT: key = "SHIFT"; break; + case WXK_ALT: key = "ALT"; break; + case WXK_CONTROL: key = "CONTROL"; break; + case WXK_MENU: key = "MENU"; break; + case WXK_PAUSE: key = "PAUSE"; break; + case WXK_CAPITAL: key = "CAPITAL"; break; + case WXK_PRIOR: key = "PRIOR"; break; + case WXK_NEXT: key = "NEXT"; break; + case WXK_END: key = "END"; break; + case WXK_HOME: key = "HOME"; break; + case WXK_LEFT: key = "LEFT"; break; + case WXK_UP: key = "UP"; break; + case WXK_RIGHT: key = "RIGHT"; break; + case WXK_DOWN: key = "DOWN"; break; + case WXK_SELECT: key = "SELECT"; break; + case WXK_PRINT: key = "PRINT"; break; + case WXK_EXECUTE: key = "EXECUTE"; break; + case WXK_SNAPSHOT: key = "SNAPSHOT"; break; + case WXK_INSERT: key = "INSERT"; break; + case WXK_HELP: key = "HELP"; break; + case WXK_NUMPAD0: key = "NUMPAD0"; break; + case WXK_NUMPAD1: key = "NUMPAD1"; break; + case WXK_NUMPAD2: key = "NUMPAD2"; break; + case WXK_NUMPAD3: key = "NUMPAD3"; break; + case WXK_NUMPAD4: key = "NUMPAD4"; break; + case WXK_NUMPAD5: key = "NUMPAD5"; break; + case WXK_NUMPAD6: key = "NUMPAD6"; break; + case WXK_NUMPAD7: key = "NUMPAD7"; break; + case WXK_NUMPAD8: key = "NUMPAD8"; break; + case WXK_NUMPAD9: key = "NUMPAD9"; break; + case WXK_MULTIPLY: key = "MULTIPLY"; break; + case WXK_ADD: key = "ADD"; break; + case WXK_SEPARATOR: key = "SEPARATOR"; break; + case WXK_SUBTRACT: key = "SUBTRACT"; break; + case WXK_DECIMAL: key = "DECIMAL"; break; + case WXK_DIVIDE: key = "DIVIDE"; break; + case WXK_F1: key = "F1"; break; + case WXK_F2: key = "F2"; break; + case WXK_F3: key = "F3"; break; + case WXK_F4: key = "F4"; break; + case WXK_F5: key = "F5"; break; + case WXK_F6: key = "F6"; break; + case WXK_F7: key = "F7"; break; + case WXK_F8: key = "F8"; break; + case WXK_F9: key = "F9"; break; + case WXK_F10: key = "F10"; break; + case WXK_F11: key = "F11"; break; + case WXK_F12: key = "F12"; break; + case WXK_F13: key = "F13"; break; + case WXK_F14: key = "F14"; break; + case WXK_F15: key = "F15"; break; + case WXK_F16: key = "F16"; break; + case WXK_F17: key = "F17"; break; + case WXK_F18: key = "F18"; break; + case WXK_F19: key = "F19"; break; + case WXK_F20: key = "F20"; break; + case WXK_F21: key = "F21"; break; + case WXK_F22: key = "F22"; break; + case WXK_F23: key = "F23"; break; + case WXK_F24: key = "F24"; break; + case WXK_NUMLOCK: key = "NUMLOCK"; break; + case WXK_SCROLL: key = "SCROLL"; break; + case WXK_PAGEUP: key = "PAGEUP"; break; + case WXK_PAGEDOWN: key = "PAGEDOWN"; break; + case WXK_NUMPAD_SPACE: key = "NUMPAD_SPACE"; break; + case WXK_NUMPAD_TAB: key = "NUMPAD_TAB"; break; + case WXK_NUMPAD_ENTER: key = "NUMPAD_ENTER"; break; + case WXK_NUMPAD_F1: key = "NUMPAD_F1"; break; + case WXK_NUMPAD_F2: key = "NUMPAD_F2"; break; + case WXK_NUMPAD_F3: key = "NUMPAD_F3"; break; + case WXK_NUMPAD_F4: key = "NUMPAD_F4"; break; + case WXK_NUMPAD_HOME: key = "NUMPAD_HOME"; break; + case WXK_NUMPAD_LEFT: key = "NUMPAD_LEFT"; break; + case WXK_NUMPAD_UP: key = "NUMPAD_UP"; break; + case WXK_NUMPAD_RIGHT: key = "NUMPAD_RIGHT"; break; + case WXK_NUMPAD_DOWN: key = "NUMPAD_DOWN"; break; + case WXK_NUMPAD_PRIOR: key = "NUMPAD_PRIOR"; break; + case WXK_NUMPAD_PAGEUP: key = "NUMPAD_PAGEUP"; break; + case WXK_NUMPAD_PAGEDOWN: key = "NUMPAD_PAGEDOWN"; break; + case WXK_NUMPAD_END: key = "NUMPAD_END"; break; + case WXK_NUMPAD_BEGIN: key = "NUMPAD_BEGIN"; break; + case WXK_NUMPAD_INSERT: key = "NUMPAD_INSERT"; break; + case WXK_NUMPAD_DELETE: key = "NUMPAD_DELETE"; break; + case WXK_NUMPAD_EQUAL: key = "NUMPAD_EQUAL"; break; + case WXK_NUMPAD_MULTIPLY: key = "NUMPAD_MULTIPLY"; break; + case WXK_NUMPAD_ADD: key = "NUMPAD_ADD"; break; + case WXK_NUMPAD_SEPARATOR: key = "NUMPAD_SEPARATOR"; break; + case WXK_NUMPAD_SUBTRACT: key = "NUMPAD_SUBTRACT"; break; + case WXK_NUMPAD_DECIMAL: key = "NUMPAD_DECIMAL"; break; + + default: + key.Printf( _T("unknown (%ld)"), keycode); + } + } + + wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"), + name, + key.c_str(), + GetChar( event.ControlDown(), _T('C') ), + GetChar( event.AltDown(), _T('A') ), + GetChar( event.ShiftDown(), _T('S') ), + GetChar( event.MetaDown(), _T('M') ) ); + +} + +void MyTextCtrl::OnChar(wxKeyEvent& event) +{ + LogEvent( _T("Char"), event); + + event.Skip(); +} + +void MyTextCtrl::OnKeyUp(wxKeyEvent& event) +{ + LogEvent( _("Key up"), event); + + event.Skip(); +} + void MyTextCtrl::OnKeyDown(wxKeyEvent& event) { switch ( event.KeyCode() ) @@ -222,11 +384,11 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) long line, column, pos = GetInsertionPoint(); PositionToXY(pos, &column, &line); - wxLogMessage("Current position: %ld\n" + wxLogMessage( _T("Current position: %ld\n" "Current line, column: (%ld, %ld)\n" "Number of lines: %ld\n" "Current line length: %ld\n" - "Total text length: %ld", + "Total text length: %ld"), pos, line, column, GetNumberOfLines(), @@ -244,10 +406,11 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event) // go to position 10 SetInsertionPoint(10); break; - - default: - event.Skip(); } + + LogEvent( _("Key down"), event); + + event.Skip(); } //---------------------------------------------------------------------- @@ -304,9 +467,11 @@ const int ID_GAUGE = 180; const int ID_SLIDER = 181; const int ID_SPIN = 182; +const int ID_BTNPROGRESS = 183; 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_DCLICK(ID_LISTBOX, MyPanel::OnListBoxDoubleClick) @@ -340,8 +505,10 @@ 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) -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON EVT_SPIN (ID_SPIN, MyPanel::OnSpinUpdate) +EVT_UPDATE_UI (ID_BTNPROGRESS, MyPanel::OnUpdateShowProgress) +EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress) #endif EVT_BUTTON (ID_PASTE_TEXT, MyPanel::OnPasteFromClipboard) EVT_BUTTON (ID_COPY_TEXT, MyPanel::OnCopyToClipboard) @@ -350,14 +517,16 @@ EVT_BUTTON (ID_MOVE_END_ENTRY, MyPanel::OnMoveToEndOfEntry) END_EVENT_TABLE() 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) + : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ), + m_text(NULL), m_notebook(NULL) { // SetBackgroundColour("cadet blue"); m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE ); // m_text->SetBackgroundColour("wheat"); + delete wxLog::SetActiveTarget(new wxLogStderr); + m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) ); wxString choices[] = @@ -427,23 +596,23 @@ m_text(NULL), m_notebook(NULL) wxPanel *panel = (wxPanel*) NULL; panel = new wxPanel(m_notebook); - m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices ); + 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 - (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) ); - (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(340,30), 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 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) ); + button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); #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), wxSize(140,30) ); + m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,130), wxSize(-1, -1), wxALIGN_RIGHT ); m_checkbox->SetValue(FALSE); #if wxUSE_TOOLTIPS m_checkbox->SetToolTip( "Click here to disable the listbox" ); @@ -452,6 +621,7 @@ m_text(NULL), m_notebook(NULL) panel = new wxPanel(m_notebook); m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices ); + 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) ); @@ -462,7 +632,7 @@ m_text(NULL), m_notebook(NULL) 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 ); + 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) ); @@ -483,7 +653,7 @@ m_text(NULL), m_notebook(NULL) (*m_multitext) << " Appended."; m_multitext->SetInsertionPoint(0); m_multitext->WriteText( "Prepended. " ); - m_multitext->AppendText( "\nPress function keys to test different wxTextCtrl functions." ); + m_multitext->AppendText( "\nPress function keys for test different tests." ); (*m_multitext) << "\nDoes it have cross cursor?"; m_multitext->SetCursor(*wxCROSS_CURSOR); @@ -505,7 +675,7 @@ m_text(NULL), m_notebook(NULL) wxString choices2[] = { "First", "Second", - /* "Third", + /* "Third", "Fourth", "Fifth", "Sixth", "Seventh", "Eighth", "Nineth", "Tenth" */ }; @@ -526,7 +696,7 @@ m_text(NULL), m_notebook(NULL) panel = new wxPanel(m_notebook); (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(180,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) ); + 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(200,10), wxSize(290,130) ); #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( @@ -548,10 +718,13 @@ m_text(NULL), m_notebook(NULL) ); #endif m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) ); -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) ); m_spinbutton->SetRange(-10,30); m_spinbutton->SetValue(-5); + + m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog", + wxPoint(208, 159) ); #endif m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); } @@ -667,6 +840,26 @@ void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 ); } +void MyPanel::OnPageChanging( wxNotebookEvent &event ) +{ + int selNew = event.GetSelection(), + selOld = event.GetOldSelection(); + if ( selOld == 2 && selNew == 4 ) + { + wxMessageBox("This demonstrates how a program may prevent the " + "page change from taking place - the current page will " + "stay the third one", "Conntrol sample", + wxICON_INFORMATION | wxOK); + + event.Veto(); + } + else + { + *m_text << "Notebook selection is being changed from " + << selOld << " to " << selNew << "\n"; + } +} + void MyPanel::OnPageChanged( wxNotebookEvent &event ) { *m_text << "Notebook selection is " << event.GetSelection() << "\n"; @@ -674,9 +867,12 @@ void MyPanel::OnPageChanged( wxNotebookEvent &event ) void MyPanel::OnListBox( wxCommandEvent &event ) { - m_text->AppendText( "ListBox selection string is: " ); + 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" ); } void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event ) @@ -706,11 +902,13 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) case ID_LISTBOX_SEL_NUM: { m_listbox->SetSelection( 2 ); + m_lbSelectThis->WarpPointer( 40, 14 ); break; } case ID_LISTBOX_SEL_STR: { m_listbox->SetStringSelection( "This" ); + m_lbSelectNum->WarpPointer( 40, 14 ); break; } case ID_LISTBOX_CLEAR: @@ -740,9 +938,12 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event ) void MyPanel::OnChoice( wxCommandEvent &event ) { - m_text->AppendText( "Choice selection string is: " ); + 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" ); } void MyPanel::OnChoiceButtons( wxCommandEvent &event ) @@ -790,9 +991,12 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event ) void MyPanel::OnCombo( wxCommandEvent &event ) { - m_text->AppendText( "ComboBox selection string is: " ); + m_text->AppendText( "ComboBox event selection string is: " ); m_text->AppendText( event.GetString() ); m_text->AppendText( "\n" ); + m_text->AppendText( "ComboBox control selection string is: " ); + m_text->AppendText( m_combo->GetStringSelection() ); + m_text->AppendText( "\n" ); } void MyPanel::OnComboButtons( wxCommandEvent &event ) @@ -883,20 +1087,64 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) m_gauge->SetValue( m_slider->GetValue() ); } -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON void MyPanel::OnSpinUpdate( wxSpinEvent &event ) { wxString value; - value.Printf( "%d", event.GetPosition() ); + value.Printf( _T("%d"), event.GetPosition() ); m_spintext->SetValue( value ); - value.Printf("Spin control range: (%d, %d), current = %d\n", + value.Printf( _T("Spin control range: (%d, %d), current = %d\n"), m_spinbutton->GetMin(), m_spinbutton->GetMax(), m_spinbutton->GetValue()); m_text->AppendText(value); } -#endif + +void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event ) +{ + event.Enable( m_spinbutton->GetValue() > 0 ); +} + +void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) +{ + int max = m_spinbutton->GetValue(); + wxProgressDialog dialog("Progress dialog example", + "An informative message", + max, // range + this, // parent + wxPD_CAN_ABORT | wxPD_APP_MODAL); + + + bool cont = TRUE; + for ( int i = 0; i < max && cont; i++ ) + { + wxSleep(1); + if ( i == max - 1 ) + { + cont = dialog.Update(i, "That's all, folks!"); + } + else if ( i == max / 2 ) + { + cont = dialog.Update(i, "Only a half left!"); + } + else + { + cont = dialog.Update(i); + } + } + + if ( !cont ) + { + *m_text << "Progress dialog aborted!\n"; + } + else + { + *m_text << "Countdown from " << max << " finished.\n"; + } +} + +#endif // wxUSE_SPINBUTTON MyPanel::~MyPanel() { @@ -947,7 +1195,7 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event) static long s_delay = 5000; wxString delay; - delay.Printf("%ld", s_delay); + delay.Printf( _T("%ld"), s_delay); delay = wxGetTextFromUser("Enter delay (in milliseconds)", "Set tooltip delay", @@ -956,11 +1204,11 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event) if ( !delay ) return; // cancelled - sscanf(delay, "%ld", &s_delay); + wxSscanf(delay, _T("%ld"), &s_delay); wxToolTip::SetDelay(s_delay); - wxLogStatus(this, "Tooltip delay set to %ld milliseconds", s_delay); + wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay); } void MyFrame::OnToggleTooltips(wxCommandEvent& event) @@ -971,14 +1219,14 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event) wxToolTip::Enable(s_enabled); - wxLogStatus(this, "Tooltips %sabled", s_enabled ? "en" : "dis"); + wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") ); } #endif // tooltips void MyFrame::OnSize( wxSizeEvent& event ) { wxString msg; - msg.Printf("%dx%d", event.GetSize().x, event.GetSize().y); + msg.Printf( _("%dx%d"), event.GetSize().x, event.GetSize().y); SetStatusText(msg, 1); event.Skip(); @@ -994,14 +1242,16 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) s_windowFocus = focus; wxString msg; - msg.Printf("Focus: wxWindow = %p" + msg.Printf( #ifdef __WXMSW__ - ", HWND = %08x" -#endif // wxMSW - , s_windowFocus + _T("Focus: wxWindow = %p, HWND = %08x"), +#else + _T("Focus: wxWindow = %p"), +#endif + s_windowFocus #ifdef __WXMSW__ , s_windowFocus->GetHWND() -#endif // wxMSW +#endif ); SetStatusText(msg);