More tests for streams.

[wxWidgets.git] / samples / controls / controls.cpp

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6a45c6ac39d3116b5749727a0a8f0acfd87f8407..6f06969923a2108bbe2b0ea4224040d2dcc46db8 100644 (file)
--- 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"
 #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"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -51,6 +45,14 @@
     #include "icons/gauge.xpm"
 #endif
 
     #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
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------


@@ -61,21 +63,6 @@ public:
     bool OnInit();
 };
 
     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);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-

 class MyPanel: public wxPanel
 {
 public:
 class MyPanel: public wxPanel
 {
 public:


@@ -94,12 +81,13 @@ public:
     void OnRadioButtons( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );
     void OnRadioButtons( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );

+    void OnPageChanging( wxNotebookEvent &event );

     void OnSliderUpdate( wxCommandEvent &event );
     void OnSliderUpdate( wxCommandEvent &event );

+#ifndef wxUSE_SPINBUTTON

     void OnSpinUpdate( wxSpinEvent &event );
     void OnSpinUpdate( wxSpinEvent &event );

-    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;
 
     wxListBox     *m_listbox;
     wxChoice      *m_choice;


@@ -108,10 +96,13 @@ public:
     wxGauge       *m_gauge;
     wxSlider      *m_slider;
     wxButton      *m_fontButton;
     wxGauge       *m_gauge;
     wxSlider      *m_slider;
     wxButton      *m_fontButton;

+    wxButton      *m_lbSelectNum;
+    wxButton      *m_lbSelectThis;
+#ifndef wxUSE_SPINBUTTON

     wxSpinButton  *m_spinbutton;
     wxSpinButton  *m_spinbutton;

+    wxButton      *m_btnProgress;
+#endif

     wxTextCtrl    *m_spintext;
     wxTextCtrl    *m_spintext;

-    MyTextCtrl    *m_multitext;
-    MyTextCtrl    *m_textentry;

     wxCheckBox    *m_checkbox;
 
     wxTextCtrl    *m_text;
     wxCheckBox    *m_checkbox;
 
     wxTextCtrl    *m_text;


@@ -174,17 +165,17 @@ bool MyApp::OnInit()
     frame->SetIcon( wxICON(mondrian) );
 
     wxMenu *file_menu = new wxMenu;
     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;
     menu_bar->Append(file_menu, "&File");
 
 #if wxUSE_TOOLTIPS
     wxMenu *tooltip_menu = new wxMenu;
 
     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");
+    tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");

     tooltip_menu->AppendSeparator();
     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");
             "enable/disable tooltips", TRUE);
     tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE);
     menu_bar->Append(tooltip_menu, "&Tooltips");


@@ -200,52 +191,6 @@ bool MyApp::OnInit()
     return TRUE;
 }
 
     return TRUE;
 }
 

-//----------------------------------------------------------------------
-// MyTextCtrl
-//----------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
-EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
-END_EVENT_TABLE()
-
-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("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;
-
-        default:
-            event.Skip();
-    }
-}
-

 //----------------------------------------------------------------------
 // MyPanel
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // MyPanel
 //----------------------------------------------------------------------


@@ -279,12 +224,6 @@ const int  ID_COMBO_DELETE      = 145;
 const int  ID_COMBO_FONT        = 146;
 const int  ID_COMBO_ENABLE      = 147;
 
 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;
 const int  ID_RADIOBOX          = 160;
 const int  ID_RADIOBOX_SEL_NUM  = 161;
 const int  ID_RADIOBOX_SEL_STR  = 162;


@@ -300,9 +239,11 @@ const int  ID_GAUGE             = 180;
 const int  ID_SLIDER            = 181;
 
 const int  ID_SPIN              = 182;
 const int  ID_SLIDER            = 181;
 
 const int  ID_SPIN              = 182;

+const int  ID_BTNPROGRESS       = 183;

 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 EVT_SIZE      (                         MyPanel::OnSize)
 
 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)
 EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK,  MyPanel::OnPageChanged)
 EVT_LISTBOX   (ID_LISTBOX,              MyPanel::OnListBox)
 EVT_LISTBOX_DCLICK(ID_LISTBOX,          MyPanel::OnListBoxDoubleClick)


@@ -336,22 +277,24 @@ 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)
 EVT_CHECKBOX  (ID_RADIOBOX_ENABLE,      MyPanel::OnRadioButtons)
 EVT_BUTTON    (ID_SET_FONT,             MyPanel::OnSetFont)
 EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)

+#ifndef wxUSE_SPINBUTTON

 EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
 EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)

-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)
+EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
+EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
+#endif

 END_EVENT_TABLE()
 
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 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");
 
 {
     //  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[] =
     m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
 
     wxString choices[] =


@@ -421,23 +364,23 @@ m_text(NULL), m_notebook(NULL)
     wxPanel *panel = (wxPanel*) NULL;
 
     panel = new wxPanel(m_notebook);
     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
 
     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) );
     (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
 
 #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" );
     m_checkbox->SetValue(FALSE);
 #if wxUSE_TOOLTIPS
     m_checkbox->SetToolTip( "Click here to disable the listbox" );


@@ -446,6 +389,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 );
 
     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) );
     (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) );


@@ -456,7 +400,7 @@ m_text(NULL), m_notebook(NULL)
     m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
     panel = new wxPanel(m_notebook);
     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) );
     (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) );


@@ -466,41 +410,12 @@ m_text(NULL), m_notebook(NULL)
     (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
     m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
     (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 to test different wxTextCtrl functions." );
-
-    (*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[] =
     {
     wxString choices2[] =
     {

-        "First", "Second", "Third",
-        "Fourth", "Fifth", //"Sixth",
-        //"Seventh", "Eighth", "Nineth", "Tenth"
+        "First", "Second",
+        /* "Third",
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */

     };
 
     panel = new wxPanel(m_notebook);
     };
 
     panel = new wxPanel(m_notebook);


@@ -519,7 +434,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) );
     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 :-(
     (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(


@@ -541,120 +456,45 @@ m_text(NULL), m_notebook(NULL)
                           );
 #endif
     m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
                           );
 #endif
     m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );

+#ifndef wxUSE_SPINBUTTON

     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );

-    m_spinbutton->SetRange(0,100);
+    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);
 }
 
     m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
 }
 

-void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnSize( wxSizeEvent& 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();
+    int x = 0;
+    int y = 0;
+    GetClientSize( &x, &y );

 
 

-    *m_text << "Closed the clipboard.\n";
-#else
-    wxLogError("Your version of wxWindows is compiled without clipboard support.");
-#endif
+    if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 );
+    if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 );

 }
 
 }
 

-void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnPageChanging( wxNotebookEvent &event )

 {
 {

-#if wxUSE_CLIPBOARD && wxUSE_DRAG_AND_DROP
-    wxString text( m_multitext->GetLineText(0) );
-
-    if (text.IsEmpty())
+    int selNew = event.GetSelection(),
+        selOld = event.GetOldSelection();
+    if ( selOld == 2 && selNew == 4 )

     {
     {

-        *m_text << "No text to copy.\n";
+        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);

 
 

-        return;
-    }
-
-    if (!wxTheClipboard->Open())
-    {
-        *m_text << "Error opening the clipboard.\n";
-
-        return;
+        event.Veto();

     }
     else
     {
     }
     else
     {

-        *m_text << "Successfully opened the clipboard.\n";
+        *m_text << "Notebook selection is being changed from "
+                << selOld << " to " << selNew << "\n";

     }
     }

-
-    wxTextDataObject *data = new wxTextDataObject( text );
-
-    if (!wxTheClipboard->SetData( data ))
-    {
-        *m_text << "Error while copying to the clipboard.\n";
-    }
-    else
-    {
-        *m_text << "Successfully copied data to the clipboard.\n";
-    }
-
-    wxTheClipboard->Close();
-
-    *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();
-}
-
-void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-    int x = 0;
-    int y = 0;
-    GetClientSize( &x, &y );
-
-    if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y*2/3-4 );
-    if (m_text) m_text->SetSize( 2, y*2/3+2, x-4, y/3-4 );

 }
 
 void MyPanel::OnPageChanged( wxNotebookEvent &event )
 }
 
 void MyPanel::OnPageChanged( wxNotebookEvent &event )


@@ -664,9 +504,12 @@ void MyPanel::OnPageChanged( wxNotebookEvent &event )
 
 void MyPanel::OnListBox( wxCommandEvent &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( 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 )
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )


@@ -696,11 +539,13 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
         case ID_LISTBOX_SEL_NUM:
             {
                 m_listbox->SetSelection( 2 );
         case ID_LISTBOX_SEL_NUM:
             {
                 m_listbox->SetSelection( 2 );

+               m_lbSelectThis->WarpPointer( 40, 14 );

                 break;
             }
         case ID_LISTBOX_SEL_STR:
             {
                 m_listbox->SetStringSelection( "This" );
                 break;
             }
         case ID_LISTBOX_SEL_STR:
             {
                 m_listbox->SetStringSelection( "This" );

+               m_lbSelectNum->WarpPointer( 40, 14 );

                 break;
             }
         case ID_LISTBOX_CLEAR:
                 break;
             }
         case ID_LISTBOX_CLEAR:


@@ -730,9 +575,12 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 
 void MyPanel::OnChoice( 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( 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 )
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )


@@ -780,9 +628,12 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 
 void MyPanel::OnCombo( 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( 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 )
 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )


@@ -873,13 +724,66 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
     m_gauge->SetValue( m_slider->GetValue() );
 }
 
     m_gauge->SetValue( m_slider->GetValue() );
 }
 

+#ifndef wxUSE_SPINBUTTON

 void MyPanel::OnSpinUpdate( wxSpinEvent &event )
 {
     wxString value;
 void MyPanel::OnSpinUpdate( wxSpinEvent &event )
 {
     wxString value;

-    value.sprintf( "%d", (int)event.GetPosition() );
+    value.Printf( _T("%d"), event.GetPosition() );

     m_spintext->SetValue( value );
     m_spintext->SetValue( value );

+
+    value.Printf( _T("Spin control range: (%d, %d), current = %d\n"),
+                 m_spinbutton->GetMin(), m_spinbutton->GetMax(),
+                 m_spinbutton->GetValue());
+
+    m_text->AppendText(value);
+}
+
+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);
+        }
+       wxYield();
+    }
+
+    if ( !cont )
+    {
+        *m_text << "Progress dialog aborted!\n";
+    }
+    else
+    {
+        *m_text << "Countdown from " << max << " finished.\n";
+    }

 }
 
 }
 

+#endif // wxUSE_SPINBUTTON
+

 MyPanel::~MyPanel()
 {
     delete m_notebook->GetImageList();
 MyPanel::~MyPanel()
 {
     delete m_notebook->GetImageList();


@@ -929,7 +833,7 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
     static long s_delay = 5000;
 
     wxString delay;
     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",
 
     delay = wxGetTextFromUser("Enter delay (in milliseconds)",
             "Set tooltip delay",


@@ -938,11 +842,11 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
     if ( !delay )
         return; // cancelled
 
     if ( !delay )
         return; // cancelled
 

-    sscanf(delay, "%ld", &s_delay);
+    wxSscanf(delay, _T("%ld"), &s_delay);

 
     wxToolTip::SetDelay(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)
 }
 
 void MyFrame::OnToggleTooltips(wxCommandEvent& event)


@@ -953,14 +857,14 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
 
     wxToolTip::Enable(s_enabled);
 
 
     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;
 }
 #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();
     SetStatusText(msg, 1);
 
     event.Skip();


@@ -976,14 +880,16 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
         s_windowFocus = focus;
 
         wxString msg;
         s_windowFocus = focus;
 
         wxString msg;

-        msg.Printf("Focus: wxWindow = %p"
+        msg.Printf(

 #ifdef __WXMSW__
 #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()
 #ifdef __WXMSW__
                 , s_windowFocus->GetHWND()

-#endif // wxMSW
+#endif

                   );
 
         SetStatusText(msg);
                   );
 
         SetStatusText(msg);