X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d0f3cd6ac9b38521b35f21cb94ef7d72aa34b9e..a3c1786def55bcc233f9606acb1aceee956d184f:/samples/controls/controls.cpp?ds=sidebyside diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 17375966c0..bd43837570 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -26,12 +26,6 @@ #include "wx/spinbutt.h" #include "wx/notebook.h" #include "wx/imaglist.h" -#include "wx/spinbutt.h" - -#if wxUSE_CLIPBOARD - #include "wx/dataobj.h" - #include "wx/clipbrd.h" -#endif #if wxUSE_TOOLTIPS #include "wx/tooltip.h" @@ -51,6 +45,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 //---------------------------------------------------------------------- @@ -61,26 +63,6 @@ public: bool OnInit(); }; -// a text ctrl which allows to call different wxTextCtrl functions -// interactively by pressing function keys in it -class MyTextCtrl : public wxTextCtrl -{ -public: - MyTextCtrl(wxWindow *parent, wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, int style = 0) - : wxTextCtrl(parent, id, value, pos, size, style) { } - - void OnKeyDown(wxKeyEvent& event); - void OnKeyUp(wxKeyEvent& event); - void OnChar(wxKeyEvent& event); - -private: - static inline char GetChar(bool on, char c) { return on ? c : '-'; } - void LogEvent(const char *name, wxKeyEvent& event) const; - - DECLARE_EVENT_TABLE() -}; - class MyPanel: public wxPanel { public: @@ -101,13 +83,11 @@ public: void OnPageChanged( wxNotebookEvent &event ); void OnPageChanging( wxNotebookEvent &event ); void OnSliderUpdate( wxCommandEvent &event ); -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON void OnSpinUpdate( wxSpinEvent &event ); -#endif - void OnPasteFromClipboard( wxCommandEvent &event ); - void OnCopyToClipboard( wxCommandEvent &event ); - void OnMoveToEndOfText( wxCommandEvent &event ); - void OnMoveToEndOfEntry( wxCommandEvent &event ); + void OnUpdateShowProgress( wxUpdateUIEvent& event ); + void OnShowProgress( wxCommandEvent &event ); +#endif // wxUSE_SPINBUTTON wxListBox *m_listbox; wxChoice *m_choice; @@ -116,12 +96,13 @@ 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; - MyTextCtrl *m_textentry; wxCheckBox *m_checkbox; wxTextCtrl *m_text; @@ -183,11 +164,11 @@ bool MyApp::OnInit() frame->SetIcon( wxICON(mondrian) ); - wxMenu *file_menu = new wxMenu; + 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"); - wxMenuBar *menu_bar = new wxMenuBar( wxMB_DOCKABLE ); + wxMenuBar *menu_bar = new wxMenuBar; menu_bar->Append(file_menu, "&File"); #if wxUSE_TOOLTIPS @@ -210,195 +191,6 @@ bool MyApp::OnInit() return TRUE; } -//---------------------------------------------------------------------- -// MyTextCtrl -//---------------------------------------------------------------------- - -BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl) - EVT_KEY_DOWN(MyTextCtrl::OnKeyDown) - EVT_KEY_UP(MyTextCtrl::OnKeyUp) - EVT_CHAR(MyTextCtrl::OnChar) -END_EVENT_TABLE() - -void MyTextCtrl::LogEvent(const char *name, wxKeyEvent& event) const -{ - wxString key; - long keycode = event.KeyCode(); - if ( isprint((int)keycode) ) - key.Printf("'%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_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("unknown (%ld)", keycode); - } - } - - wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"), - name, - key.c_str(), - GetChar(event.ControlDown(), 'C'), - GetChar(event.AltDown(), 'A'), - GetChar(event.ShiftDown(), 'S'), - GetChar(event.MetaDown(), 'M')); - -} - -void MyTextCtrl::OnChar(wxKeyEvent& event) -{ - LogEvent("Char", event); - - event.Skip(); -} - -void MyTextCtrl::OnKeyUp(wxKeyEvent& event) -{ - LogEvent("Key up", event); - - event.Skip(); -} - -void MyTextCtrl::OnKeyDown(wxKeyEvent& event) -{ - switch ( event.KeyCode() ) - { - case WXK_F1: - // show current position and text length - { - long line, column, pos = GetInsertionPoint(); - PositionToXY(pos, &column, &line); - - 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"), - pos, - line, column, - GetNumberOfLines(), - GetLineLength(line), - GetLastPosition()); - } - break; - - case WXK_F2: - // go to the end - SetInsertionPointEnd(); - break; - - case WXK_F3: - // go to position 10 - SetInsertionPoint(10); - break; - } - - LogEvent("Key down", event); - - event.Skip(); -} - //---------------------------------------------------------------------- // MyPanel //---------------------------------------------------------------------- @@ -432,12 +224,6 @@ const int ID_COMBO_DELETE = 145; const int ID_COMBO_FONT = 146; const int ID_COMBO_ENABLE = 147; -const int ID_TEXT = 150; -const int ID_PASTE_TEXT = 151; -const int ID_COPY_TEXT = 152; -const int ID_MOVE_END_ENTRY = 153; -const int ID_MOVE_END_ZONE = 154; - const int ID_RADIOBOX = 160; const int ID_RADIOBOX_SEL_NUM = 161; const int ID_RADIOBOX_SEL_STR = 162; @@ -453,6 +239,7 @@ 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) @@ -490,13 +277,11 @@ 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) -EVT_BUTTON (ID_MOVE_END_ZONE, MyPanel::OnMoveToEndOfText) -EVT_BUTTON (ID_MOVE_END_ENTRY, MyPanel::OnMoveToEndOfEntry) END_EVENT_TABLE() MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) @@ -585,8 +370,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) 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) ); @@ -612,6 +397,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (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) ); + m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice); panel = new wxPanel(m_notebook); @@ -625,36 +411,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) ); m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo); - panel = new wxPanel(m_notebook); - m_textentry = new MyTextCtrl( panel, -1, "Some text.", wxPoint(10,10), wxSize(320,28), //0); - wxTE_PROCESS_ENTER); - (*m_textentry) << " Appended."; - m_textentry->SetInsertionPoint(0); - m_textentry->WriteText( "Prepended. " ); - - m_multitext = new MyTextCtrl( panel, ID_TEXT, "Some text.", wxPoint(10,50), wxSize(320,70), wxTE_MULTILINE ); - (*m_multitext) << " Appended."; - m_multitext->SetInsertionPoint(0); - m_multitext->WriteText( "Prepended. " ); - m_multitext->AppendText( "\nPress function keys for test different tests." ); - - (*m_multitext) << "\nDoes it have cross cursor?"; - m_multitext->SetCursor(*wxCROSS_CURSOR); - - new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.", wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB); -#if wxUSE_TOOLTIPS - m_multitext->AppendText( "\nThis ctrl has a tooltip. " ); - m_multitext->SetToolTip("Press F1 here."); -#endif // wxUSE_TOOLTIPS - - (void)new wxStaticBox( panel, -1, "&Move cursor to the end of:", wxPoint(345, 0), wxSize(160, 100) ); - (void)new wxButton( panel, ID_MOVE_END_ENTRY, "Text &entry", wxPoint(370, 20), wxSize(110, 30) ); - (void)new wxButton( panel, ID_MOVE_END_ZONE, "Text &zone", wxPoint(370, 60), wxSize(110, 30) ); - (void)new wxStaticBox( panel, -1, "wx&Clipboard", wxPoint(345,100), wxSize(160,100) ); - (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(370,120), wxSize(110,30) ); - (void)new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(370,160), wxSize(110,30) ); - m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text ); - wxString choices2[] = { "First", "Second", @@ -671,7 +427,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) 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) ); + wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP ); rb->SetValue( FALSE ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) ); m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); @@ -701,113 +457,43 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) ); #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); -#endif - m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); -} - -void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) ) -{ - // We test for wxUSE_DRAG_AND_DROP also, because data objects - // may not be implemented for compilers that can't cope with the OLE - // parts in wxUSE_DRAG_AND_DROP. - -#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP - if (!wxTheClipboard->Open()) - { - *m_text << "Error opening the clipboard.\n"; - return; - } - else - { - *m_text << "Successfully opened the clipboard.\n"; - } - - wxTextDataObject data; - - if (wxTheClipboard->IsSupported( data.GetFormat() )) - { - *m_text << "Clipboard supports requested format.\n"; - - if (wxTheClipboard->GetData( &data )) - { - *m_text << "Successfully retrieved data from the clipboard.\n"; - *m_multitext << data.GetText() << "\n"; - } - else - { - *m_text << "Error getting data from the clipboard.\n"; - } - } - else - { - *m_text << "Clipboard doesn't support requested format.\n"; - } - - wxTheClipboard->Close(); - - *m_text << "Closed the clipboard.\n"; -#else - wxLogError("Your version of wxWindows is compiled without clipboard support."); + m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog", + wxPoint(208, 159) ); #endif -} - -void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) ) -{ -#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP - wxString text( m_multitext->GetLineText(0) ); - - if (text.IsEmpty()) - { - *m_text << "No text to copy.\n"; - - return; - } + m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); - if (!wxTheClipboard->Open()) - { - *m_text << "Error opening the clipboard.\n"; + panel = new wxPanel(m_notebook); + wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); + wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10)); - return; - } - else - { - *m_text << "Successfully opened the clipboard.\n"; - } + bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10)); + bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION)); - wxTextDataObject *data = new wxTextDataObject( text ); + wxBitmap bitmap( 100, 100 ); + wxMemoryDC dc; + dc.SelectObject( bitmap ); + dc.SetPen(*wxGREEN_PEN); + dc.DrawEllipse(5, 5, 90, 90); + dc.DrawText("Bitmap", 20, 20); + dc.SelectObject( wxNullBitmap ); - if (!wxTheClipboard->SetData( data )) - { - *m_text << "Error while copying to the clipboard.\n"; - } - else - { - *m_text << "Successfully copied data to the clipboard.\n"; - } + wxBitmapButton *bmpBtn = new wxBitmapButton + ( + panel, + -1, + bitmap, + wxPoint(100, 20) + ); + bmpBtn = NULL; // suppress warning - wxTheClipboard->Close(); + new wxButton(panel, -1, "Another button", wxPoint(250, 20)); - *m_text << "Closed the clipboard.\n"; -#else - wxLogError("Your version of wxWindows is compiled without clipboard support."); -#endif -} - -void MyPanel::OnMoveToEndOfText( wxCommandEvent &event ) -{ - m_multitext->SetInsertionPointEnd(); - m_multitext->SetFocus(); -} - -void MyPanel::OnMoveToEndOfEntry( wxCommandEvent &event ) -{ - m_textentry->SetInsertionPointEnd(); - m_textentry->SetFocus(); + m_notebook->AddPage(panel, "wxBitmapXXX"); } void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) @@ -822,22 +508,20 @@ void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) void MyPanel::OnPageChanging( wxNotebookEvent &event ) { - int selNew = event.GetSelection(), - selOld = event.GetOldSelection(); - if ( selOld == 2 && selNew == 4 ) + int selOld = event.GetOldSelection(); + if ( selOld == 2 ) { wxMessageBox("This demonstrates how a program may prevent the " - "page change from taking place - the current page will " - "stay the third one", "Conntrol sample", + "page change from taking place - \n the current page will " + "stay the third one", "Control sample", wxICON_INFORMATION | wxOK); event.Veto(); + + return; } - else - { - *m_text << "Notebook selection is being changed from " - << selOld << " to " << selNew << "\n"; - } + + *m_text << "Notebook selection is being changed from " << selOld << "\n"; } void MyPanel::OnPageChanged( wxNotebookEvent &event ) @@ -882,11 +566,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: @@ -1065,7 +751,7 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) m_gauge->SetValue( m_slider->GetValue() ); } -#ifndef __WIN16__ +#ifndef wxUSE_SPINBUTTON void MyPanel::OnSpinUpdate( wxSpinEvent &event ) { wxString value; @@ -1078,7 +764,51 @@ void MyPanel::OnSpinUpdate( wxSpinEvent &event ) 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 | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME); + + + 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() {