Added the forgotten file txtstrm.tex

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 5db7efa8dc22e5c9d3b64a9bf9a004a0f8371319..bd4383757080479cd220bb786a031f83ead9df98 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -26,9 +26,10 @@
 #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"
-#include "wx/clipbrd.h"
-#include "wx/tooltip.h"
+
+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif

 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
     #define USE_XPM
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
     #define USE_XPM


@@ -44,35 +45,27 @@
     #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 MyApp: public wxApp
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------
 
 class MyApp: public wxApp

-{
-  public:
-    bool OnInit(void);
-};
-
-// a text ctrl which allows to call different wxTextCtrl functions
-// interactively by pressing function keys in it
-class MyTextCtrl : public wxTextCtrl

 {
 public:
 {
 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()
+    bool OnInit();

 };
 
 class MyPanel: public wxPanel
 {
 };
 
 class MyPanel: public wxPanel
 {

-  public:
-
+public:

     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 


@@ -88,12 +81,13 @@ class MyPanel: public wxPanel
     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;


@@ -102,32 +96,38 @@ class MyPanel: public wxPanel
     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;
     wxNotebook    *m_notebook;
 
     wxCheckBox    *m_checkbox;
 
     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 

-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 class MyFrame: public wxFrame
 {
 };
 
 class MyFrame: public wxFrame
 {

-  public:
-
+public:

     MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
 
     MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
 

-  public:
-

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+#if wxUSE_TOOLTIPS
+    void OnSetTooltipDelay(wxCommandEvent& event);
+    void OnToggleTooltips(wxCommandEvent& event);
+#endif // wxUSE_TOOLTIPS

     void OnIdle( wxIdleEvent& event );
     void OnSize( wxSizeEvent& event );
 
     void OnIdle( wxIdleEvent& event );
     void OnSize( wxSizeEvent& event );
 

-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 //----------------------------------------------------------------------
 };
 
 //----------------------------------------------------------------------


@@ -140,82 +140,55 @@ IMPLEMENT_APP(MyApp)
 // MyApp
 //----------------------------------------------------------------------
 
 // MyApp
 //----------------------------------------------------------------------
 

-const   int MINIMAL_QUIT   = 100;
-const   int MINIMAL_TEXT   = 101;
-const   int MINIMAL_ABOUT  = 102;
-
-bool MyApp::OnInit(void)
+enum

 {
 {

-  // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL,
-                               "Controls wxWindows App",
-                               50, 50, 530, 420);
-
-  // Give it an icon
-  // The wxICON() macros loads an icon from a resource under Windows
-  // and uses an #included XPM image under GTK+ and Motif
-
-  frame->SetIcon( wxICON(mondrian) );
+    MINIMAL_QUIT   = 100,
+    MINIMAL_TEXT,
+    MINIMAL_ABOUT,

 
 

-  wxMenu *file_menu = new wxMenu;
+    // tooltip menu
+    MINIMAL_SET_TOOLTIP_DELAY = 200,
+    MINIMAL_ENABLE_TOOLTIPS
+};

 
 

-  file_menu->Append(MINIMAL_ABOUT, "&About");
-  file_menu->Append(MINIMAL_QUIT, "E&xit");
-  wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
-  frame->SetMenuBar(menu_bar);
+bool MyApp::OnInit()
+{
+    // Create the main frame window
+    MyFrame *frame = new MyFrame((wxFrame *) NULL,
+            "Controls wxWindows App",
+            50, 50, 530, 420);

 
 

-  frame->Show(TRUE);
+    // Give it an icon
+    // The wxICON() macros loads an icon from a resource under Windows
+    // and uses an #included XPM image under GTK+ and Motif

 
 

-  SetTopWindow(frame);
+    frame->SetIcon( wxICON(mondrian) );

 
 

-  return TRUE;
-}
+    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");

 
 

-//----------------------------------------------------------------------
-// MyTextCtrl
-//----------------------------------------------------------------------
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, "&File");

 
 

-BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
-    EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
-END_EVENT_TABLE()
+#if wxUSE_TOOLTIPS
+    wxMenu *tooltip_menu = new wxMenu;
+    tooltip_menu->Append(MINIMAL_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
+    tooltip_menu->AppendSeparator();
+    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");
+#endif // wxUSE_TOOLTIPS

 
 

-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;
+    frame->SetMenuBar(menu_bar);

 
 

-        case WXK_F2:
-            // go to the end
-            SetInsertionPointEnd();
-            break;
+    frame->Show(TRUE);
+    frame->SetCursor(wxCursor(wxCURSOR_HAND));

 
 

-        case WXK_F3:
-            // go to position 10
-            SetInsertionPoint(10);
-            break;
+    SetTopWindow(frame);

 
 

-        default:
-            event.Skip();
-    }
+    return TRUE;

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -251,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;


@@ -272,113 +239,117 @@ 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)
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)

-  EVT_SIZE      (                         MyPanel::OnSize)
-  EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK,  MyPanel::OnPageChanged)
-  EVT_LISTBOX   (ID_LISTBOX,              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)
-  EVT_BUTTON    (ID_LISTBOX_CLEAR,        MyPanel::OnListBoxButtons)
-  EVT_BUTTON    (ID_LISTBOX_APPEND,       MyPanel::OnListBoxButtons)
-  EVT_BUTTON    (ID_LISTBOX_DELETE,       MyPanel::OnListBoxButtons)
-  EVT_BUTTON    (ID_LISTBOX_FONT,         MyPanel::OnListBoxButtons)
-  EVT_CHECKBOX  (ID_LISTBOX_ENABLE,       MyPanel::OnListBoxButtons)
-  EVT_CHOICE    (ID_CHOICE,               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)
-  EVT_BUTTON    (ID_CHOICE_APPEND,        MyPanel::OnChoiceButtons)
-  EVT_BUTTON    (ID_CHOICE_DELETE,        MyPanel::OnChoiceButtons)
-  EVT_BUTTON    (ID_CHOICE_FONT,          MyPanel::OnChoiceButtons)
-  EVT_CHECKBOX  (ID_CHOICE_ENABLE,        MyPanel::OnChoiceButtons)
-  EVT_COMBOBOX  (ID_COMBO,                MyPanel::OnCombo)
-  EVT_BUTTON    (ID_COMBO_SEL_NUM,        MyPanel::OnComboButtons)
-  EVT_BUTTON    (ID_COMBO_SEL_STR,        MyPanel::OnComboButtons)
-  EVT_BUTTON    (ID_COMBO_CLEAR,          MyPanel::OnComboButtons)
-  EVT_BUTTON    (ID_COMBO_APPEND,         MyPanel::OnComboButtons)
-  EVT_BUTTON    (ID_COMBO_DELETE,         MyPanel::OnComboButtons)
-  EVT_BUTTON    (ID_COMBO_FONT,           MyPanel::OnComboButtons)
-  EVT_CHECKBOX  (ID_COMBO_ENABLE,         MyPanel::OnComboButtons)
-  EVT_RADIOBOX  (ID_RADIOBOX,             MyPanel::OnRadio)
-  EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
-  EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
-  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_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_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_BUTTON    (ID_LISTBOX_SEL_NUM,      MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_SEL_STR,      MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_CLEAR,        MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_APPEND,       MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_DELETE,       MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_FONT,         MyPanel::OnListBoxButtons)
+EVT_CHECKBOX  (ID_LISTBOX_ENABLE,       MyPanel::OnListBoxButtons)
+EVT_CHOICE    (ID_CHOICE,               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)
+EVT_BUTTON    (ID_CHOICE_APPEND,        MyPanel::OnChoiceButtons)
+EVT_BUTTON    (ID_CHOICE_DELETE,        MyPanel::OnChoiceButtons)
+EVT_BUTTON    (ID_CHOICE_FONT,          MyPanel::OnChoiceButtons)
+EVT_CHECKBOX  (ID_CHOICE_ENABLE,        MyPanel::OnChoiceButtons)
+EVT_COMBOBOX  (ID_COMBO,                MyPanel::OnCombo)
+EVT_BUTTON    (ID_COMBO_SEL_NUM,        MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_SEL_STR,        MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_CLEAR,          MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_APPEND,         MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_DELETE,         MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_FONT,           MyPanel::OnComboButtons)
+EVT_CHECKBOX  (ID_COMBO_ENABLE,         MyPanel::OnComboButtons)
+EVT_RADIOBOX  (ID_RADIOBOX,             MyPanel::OnRadio)
+EVT_BUTTON    (ID_RADIOBOX_SEL_NUM,     MyPanel::OnRadioButtons)
+EVT_BUTTON    (ID_RADIOBOX_SEL_STR,     MyPanel::OnRadioButtons)
+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 wxUSE_SPINBUTTON
+EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
+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 )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
          m_text(NULL), m_notebook(NULL)
 {
 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)
 {

-//  SetBackgroundColour("cadet blue");
+    //  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");
+    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_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
+    delete wxLog::SetActiveTarget(new wxLogStderr);

 
 

-  wxString choices[] =
-  {
-    "This",
-    "is one of my",
-    "really",
-    "wonderful",
-    "examples."
-  };
+    m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
+
+    wxString choices[] =
+    {
+        "This",
+        "is one of my",
+        "really",
+        "wonderful",
+        "examples."
+    };

 
 #ifdef USE_XPM
 
 #ifdef USE_XPM

-  // image ids
-  enum
-  {
-    Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
-  };
-
-  // fill the image list
-  wxImageList *imagelist = new wxImageList(32, 32);
-
-  imagelist-> Add( wxBitmap( list_xpm ));
-  imagelist-> Add( wxBitmap( choice_xpm ));
-  imagelist-> Add( wxBitmap( combo_xpm ));
-  imagelist-> Add( wxBitmap( text_xpm ));
-  imagelist-> Add( wxBitmap( radio_xpm ));
-  imagelist-> Add( wxBitmap( gauge_xpm ));
-  m_notebook->SetImageList(imagelist);
+    // image ids
+    enum
+    {
+        Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+    };
+
+    // fill the image list
+    wxImageList *imagelist = new wxImageList(32, 32);
+
+    imagelist-> Add( wxBitmap( list_xpm ));
+    imagelist-> Add( wxBitmap( choice_xpm ));
+    imagelist-> Add( wxBitmap( combo_xpm ));
+    imagelist-> Add( wxBitmap( text_xpm ));
+    imagelist-> Add( wxBitmap( radio_xpm ));
+    imagelist-> Add( wxBitmap( gauge_xpm ));
+    m_notebook->SetImageList(imagelist);

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-  // load images from resources
-  enum
-  {
-    Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
-  };
-  wxImageList *imagelist = new wxImageList(32, 32, FALSE, Image_Max);
-
-  static const char *s_iconNames[Image_Max] =
-  {
-      "list", "choice", "combo", "text", "radio", "gauge"
-  };
-
-  for ( size_t n = 0; n < Image_Max; n++ )
-  {
-      wxBitmap bmp(s_iconNames[n]);
-      if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
-      {
-          wxLogWarning("Couldn't load the image '%s' for the notebook page %d.",
-                       s_iconNames[n], n);
-      }
-  }
-
-  m_notebook->SetImageList(imagelist);
+    // load images from resources
+    enum
+    {
+        Image_List, Image_Choice, Image_Combo, Image_Text, Image_Radio, Image_Gauge, Image_Max
+    };
+    wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max);
+
+    static const char *s_iconNames[Image_Max] =
+    {
+        "list", "choice", "combo", "text", "radio", "gauge"
+    };
+
+    for ( size_t n = 0; n < Image_Max; n++ )
+    {
+        wxBitmap bmp(s_iconNames[n]);
+        if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
+        {
+            wxLogWarning("Couldn't load the image '%s' for the notebook page %d.",
+                    s_iconNames[n], n);
+        }
+    }
+
+    m_notebook->SetImageList(imagelist);

 #else
 
 #else
 

-// No images for now
+    // No images for now

 #define    Image_List -1
 #define    Image_Choice -1
 #define    Image_Combo -1
 #define    Image_List -1
 #define    Image_Choice -1
 #define    Image_Combo -1


@@ -389,446 +360,459 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #endif
 
 
 #endif
 

-  wxButton *button = (wxButton*) NULL;  /* who did this ? */
-  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->SetToolTip( "This is a list box" );
-
-  (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) );
-  (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->SetToolTip( "Press here to set italic font" );
-
-  m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "Disable", wxPoint(20,130), wxSize(140,30) );
-  m_checkbox->SetValue(FALSE);
-  m_checkbox->SetToolTip( "Click here to disable the listbox" );
-  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 );
-  (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) );
-  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 );
-  (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) );
-  m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
-
-  panel = new wxPanel(m_notebook);
-  m_textentry = new MyTextCtrl( panel, -1, "Write text here.", wxPoint(10,10), wxSize(320,28),
-                                0);//wxTE_PROCESS_ENTER);
-  (*m_textentry) << " More text.";          // this text is appended
-  m_textentry->SetInsertionPoint(0);
-  m_textentry->WriteText("Less text.");     // this text is prepended
-
-  m_multitext = new MyTextCtrl( panel, ID_TEXT, "And here.", wxPoint(10,50), wxSize(320,70),
-                                wxTE_MULTILINE );
-  (*m_multitext) << " More text.\nPress function keys to test different \nwxTextCtrl functions.";
-  new MyTextCtrl( panel, -1, "This one is with wxTE_PROCESS_TAB style.",
-                             wxPoint(10,120), wxSize(320,70), wxTE_MULTILINE | wxTE_PROCESS_TAB);
-
-  (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,110), wxSize(160,100) );
-  (void)new wxButton( panel, ID_COPY_TEXT, "C&opy line 1", wxPoint(375,130), wxSize(110,30) );
-  (new wxButton( panel, ID_PASTE_TEXT, "&Paste text", wxPoint(375,170), wxSize(110,30) ))
-      ->SetDefault();
-  m_notebook->AddPage( panel, "wxTextCtrl" , FALSE, Image_Text );
-
-  wxString choices2[] =
-  {
-    "Wonderful",
-    "examples.",
-  };
-
-  panel = new wxPanel(m_notebook);
-  (void)new wxRadioBox( panel, ID_RADIOBOX, "That", wxPoint(10,160), wxSize(-1,-1), 2, choices2, 1, wxRA_SPECIFY_ROWS );
-  m_radio = new wxRadioBox( panel, ID_RADIOBOX, "This", wxPoint(10,10), wxSize(-1,-1), 5, 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) );
-  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);
-
-  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) );
-  (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );
+    wxButton *button = (wxButton*) NULL;  /* who did this ? */
+    wxPanel *panel = (wxPanel*) NULL;
+
+    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) );
+#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(-1, -1), wxALIGN_RIGHT );
+    m_checkbox->SetValue(FALSE);
+#if wxUSE_TOOLTIPS
+    m_checkbox->SetToolTip( "Click here to disable the listbox" );
+#endif // wxUSE_TOOLTIPS
+    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_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) );
+
+    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) );
+    m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
+
+    wxString choices2[] =
+    {
+        "First", "Second",
+        /* "Third",
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */
+    };
+
+    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 );
+    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);
+
+    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), wxSL_LABELS );
+    (void)new wxStaticBox( panel, -1, "Explanation", wxPoint(200,10), wxSize(290,130) );

 #ifdef __WXMOTIF__
 #ifdef __WXMOTIF__

-  // No wrapping text in wxStaticText yet :-(
-  (void)new wxStaticText( panel, -1,
-    "Drag the slider!",
-    wxPoint(208,30),
-    wxSize(210, -1)
-    );
+    // No wrapping text in wxStaticText yet :-(
+    (void)new wxStaticText( panel, -1,
+                            "Drag the slider!",
+                            wxPoint(208,30),
+                            wxSize(210, -1)
+                          );

 #else
 #else

-  (void)new wxStaticText( panel, -1,
-    "In order see the gauge (aka progress bar)\n"
-    "control do something you have to drag the\n"
-    "handle of the slider to the right.\n"
-    "\n"
-    "This is also supposed to demonstrate how\n"
-    "to use static controls.\n",
-    wxPoint(208,25),
-    wxSize(250, 110)
-    );
+    (void)new wxStaticText( panel, -1,
+                            "In order see the gauge (aka progress bar)\n"
+                            "control do something you have to drag the\n"
+                            "handle of the slider to the right.\n"
+                            "\n"
+                            "This is also supposed to demonstrate how\n"
+                            "to use static controls.\n",
+                            wxPoint(208,25),
+                            wxSize(250, 110)
+                          );

 #endif
 #endif

-  m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
-  m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
-  m_spinbutton->SetRange(0,100);
-  m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
-}
-
-void MyPanel::OnPasteFromClipboard( wxCommandEvent &WXUNUSED(event) )
-{
-#ifdef __WXGTK__
-
-  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 ))
-  {
-     *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("Clipboard API is not yet implemented for this platform.");
+    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->SetRange(-10,30);
+    m_spinbutton->SetValue(-5);
+
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog",
+                                  wxPoint(208, 159) );

 #endif
 #endif

+    m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
+
+    panel = new wxPanel(m_notebook);
+    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
+    wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10));
+
+    bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
+    bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
+
+    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 );
+
+    wxBitmapButton *bmpBtn = new wxBitmapButton
+                                 (
+                                  panel,
+                                  -1,
+                                  bitmap,
+                                  wxPoint(100, 20)
+                                 );
+    bmpBtn = NULL; // suppress warning
+
+    new wxButton(panel, -1, "Another button", wxPoint(250, 20));
+
+    m_notebook->AddPage(panel, "wxBitmapXXX");

 }
 
 }
 

-void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )

 {
 {

-#ifdef __WXGTK__
-
-  wxString text( m_multitext->GetLineText(0) );
-
-  if (text.IsEmpty()) return;
-
-  if (!wxTheClipboard->Open())
-  {
-     *m_text << "Error opening the clipboard." << "\n";
+    int x = 0;
+    int y = 0;
+    GetClientSize( &x, &y );

 
 

-     return;
-  }
-  else
-  {
-     *m_text << "Successfully opened the clipboard." << "\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";
-
-#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::OnMoveToEndOfText( wxCommandEvent &event )
+void MyPanel::OnPageChanging( wxNotebookEvent &event )

 {
 {

-    m_multitext->SetInsertionPointEnd();
-    m_multitext->SetFocus();
-}
+    int selOld = event.GetOldSelection();
+    if ( selOld == 2 )
+    {
+        wxMessageBox("This demonstrates how a program may prevent the "
+                     "page change from taking place - \n the current page will "
+                     "stay the third one", "Control sample",
+                     wxICON_INFORMATION | wxOK);

 
 

-void MyPanel::OnMoveToEndOfEntry( wxCommandEvent &event )
-{
-    m_textentry->SetInsertionPointEnd();
-    m_textentry->SetFocus();
-}
+        event.Veto();

 
 

-void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
-{
-  int x = 0;
-  int y = 0;
-  GetClientSize( &x, &y );
+        return;
+    }

 
 

-  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 );
+    *m_text << "Notebook selection is being changed from " << selOld << "\n";

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

-  *m_text << "Notebook selection is " << event.GetSelection() << "\n";
+    *m_text << "Notebook selection is " << event.GetSelection() << "\n";

 }
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {

-  m_text->AppendText( "ListBox selection string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    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 )
 {
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
 {

-  m_text->AppendText( "ListBox double click string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    m_text->AppendText( "ListBox double click string is: " );
+    m_text->AppendText( event.GetString() );
+    m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )
 {

-  switch (event.GetId())
-  {
-    case ID_LISTBOX_ENABLE:
-    {
-      m_text->AppendText("Checkbox clicked.\n");
-      wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
-      if (event.GetInt())
-        cb->SetToolTip( "Click to enable listbox" );
-      else
-        cb->SetToolTip( "Click to disable listbox" );
-      m_listbox->Enable( event.GetInt() == 0 );
-      break;
-    }
-    case ID_LISTBOX_SEL_NUM:
-    {
-      m_listbox->SetSelection( 2 );
-      break;
-    }
-    case ID_LISTBOX_SEL_STR:
-    {
-      m_listbox->SetStringSelection( "This" );
-      break;
-    }
-    case ID_LISTBOX_CLEAR:
-    {
-      m_listbox->Clear();
-      break;
-    }
-    case ID_LISTBOX_APPEND:
-    {
-      m_listbox->Append( "Hi!" );
-      break;
-    }
-    case ID_LISTBOX_DELETE:
-    {
-      int idx = m_listbox->GetSelection();
-      m_listbox->Delete( idx );
-      break;
-    }
-    case ID_LISTBOX_FONT:
+    switch (event.GetId())

     {
     {

-      m_listbox->SetFont( *wxITALIC_FONT );
-      m_checkbox->SetFont( *wxITALIC_FONT );
-      break;
+        case ID_LISTBOX_ENABLE:
+            {
+                m_text->AppendText("Checkbox clicked.\n");
+                wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
+#if wxUSE_TOOLTIPS
+                if (event.GetInt())
+                    cb->SetToolTip( "Click to enable listbox" );
+                else
+                    cb->SetToolTip( "Click to disable listbox" );
+#endif // wxUSE_TOOLTIPS
+                m_listbox->Enable( event.GetInt() == 0 );
+                break;
+            }
+        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:
+            {
+                m_listbox->Clear();
+                break;
+            }
+        case ID_LISTBOX_APPEND:
+            {
+                m_listbox->Append( "Hi!" );
+                break;
+            }
+        case ID_LISTBOX_DELETE:
+            {
+                int idx = m_listbox->GetSelection();
+                m_listbox->Delete( idx );
+                break;
+            }
+        case ID_LISTBOX_FONT:
+            {
+                m_listbox->SetFont( *wxITALIC_FONT );
+                m_checkbox->SetFont( *wxITALIC_FONT );
+                break;
+            }

     }
     }

-  }

 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnChoice( wxCommandEvent &event )
 {

-  m_text->AppendText( "Choice selection string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    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 )
 {
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 {

-  switch (event.GetId())
-  {
-    case ID_CHOICE_ENABLE:
-    {
-      m_choice->Enable( event.GetInt() == 0 );
-      break;
-    }
-    case ID_CHOICE_SEL_NUM:
-    {
-      m_choice->SetSelection( 2 );
-      break;
-    }
-    case ID_CHOICE_SEL_STR:
+    switch (event.GetId())

     {
     {

-      m_choice->SetStringSelection( "This" );
-      break;
-    }
-    case ID_CHOICE_CLEAR:
-    {
-      m_choice->Clear();
-      break;
-    }
-    case ID_CHOICE_APPEND:
-    {
-      m_choice->Append( "Hi!" );
-      break;
-    }
-    case ID_CHOICE_DELETE:
-    {
-      int idx = m_choice->GetSelection();
-      m_choice->Delete( idx );
-      break;
-    }
-    case ID_CHOICE_FONT:
-    {
-      m_choice->SetFont( *wxITALIC_FONT );
-      break;
+        case ID_CHOICE_ENABLE:
+            {
+                m_choice->Enable( event.GetInt() == 0 );
+                break;
+            }
+        case ID_CHOICE_SEL_NUM:
+            {
+                m_choice->SetSelection( 2 );
+                break;
+            }
+        case ID_CHOICE_SEL_STR:
+            {
+                m_choice->SetStringSelection( "This" );
+                break;
+            }
+        case ID_CHOICE_CLEAR:
+            {
+                m_choice->Clear();
+                break;
+            }
+        case ID_CHOICE_APPEND:
+            {
+                m_choice->Append( "Hi!" );
+                break;
+            }
+        case ID_CHOICE_DELETE:
+            {
+                int idx = m_choice->GetSelection();
+                m_choice->Delete( idx );
+                break;
+            }
+        case ID_CHOICE_FONT:
+            {
+                m_choice->SetFont( *wxITALIC_FONT );
+                break;
+            }

     }
     }

-  }

 }
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnCombo( wxCommandEvent &event )
 {

-  m_text->AppendText( "ComboBox selection string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    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 )
 {
 }
 
 void MyPanel::OnComboButtons( wxCommandEvent &event )
 {

-  switch (event.GetId())
-  {
-    case ID_COMBO_ENABLE:
-    {
-      m_combo->Enable( event.GetInt() == 0 );
-      break;
-    }
-    case ID_COMBO_SEL_NUM:
-    {
-      m_combo->SetSelection( 2 );
-      break;
-    }
-    case ID_COMBO_SEL_STR:
-    {
-      m_combo->SetStringSelection( "This" );
-      break;
-    }
-    case ID_COMBO_CLEAR:
-    {
-      m_combo->Clear();
-      break;
-    }
-    case ID_COMBO_APPEND:
-    {
-      m_combo->Append( "Hi!" );
-      break;
-    }
-    case ID_COMBO_DELETE:
+    switch (event.GetId())

     {
     {

-      int idx = m_combo->GetSelection();
-      m_combo->Delete( idx );
-      break;
-    }
-    case ID_COMBO_FONT:
-    {
-      m_combo->SetFont( *wxITALIC_FONT );
-      break;
+        case ID_COMBO_ENABLE:
+            {
+                m_combo->Enable( event.GetInt() == 0 );
+                break;
+            }
+        case ID_COMBO_SEL_NUM:
+            {
+                m_combo->SetSelection( 2 );
+                break;
+            }
+        case ID_COMBO_SEL_STR:
+            {
+                m_combo->SetStringSelection( "This" );
+                break;
+            }
+        case ID_COMBO_CLEAR:
+            {
+                m_combo->Clear();
+                break;
+            }
+        case ID_COMBO_APPEND:
+            {
+                m_combo->Append( "Hi!" );
+                break;
+            }
+        case ID_COMBO_DELETE:
+            {
+                int idx = m_combo->GetSelection();
+                m_combo->Delete( idx );
+                break;
+            }
+        case ID_COMBO_FONT:
+            {
+                m_combo->SetFont( *wxITALIC_FONT );
+                break;
+            }

     }
     }

-  }

 }
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {

-  m_text->AppendText( "RadioBox selection string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    m_text->AppendText( "RadioBox selection string is: " );
+    m_text->AppendText( event.GetString() );
+    m_text->AppendText( "\n" );

 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )
 {
 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )
 {

-  switch (event.GetId())
-  {
-    case ID_RADIOBOX_ENABLE:
-    {
-      m_radio->Enable( event.GetInt() == 0 );
-      break;
-    }
-    case ID_RADIOBOX_SEL_NUM:
+    switch (event.GetId())

     {
     {

-      m_radio->SetSelection( 2 );
-      break;
-    }
-    case ID_RADIOBOX_SEL_STR:
-    {
-      m_radio->SetStringSelection( "This" );
-      break;
-    }
-    case ID_RADIOBOX_FONT:
-    {
-      m_radio->SetFont( *wxITALIC_FONT );
-      break;
+        case ID_RADIOBOX_ENABLE:
+            {
+                m_radio->Enable( event.GetInt() == 0 );
+                break;
+            }
+        case ID_RADIOBOX_SEL_NUM:
+            {
+                m_radio->SetSelection( 2 );
+                break;
+            }
+        case ID_RADIOBOX_SEL_STR:
+            {
+                m_radio->SetStringSelection( "This" );
+                break;
+            }
+        case ID_RADIOBOX_FONT:
+            {
+                m_radio->SetFont( *wxITALIC_FONT );
+                break;
+            }

     }
     }

-  }

 }
 
 void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
 {

-  m_fontButton->SetFont( *wxITALIC_FONT );
-  m_text->SetFont( *wxITALIC_FONT );
+    m_fontButton->SetFont( *wxITALIC_FONT );
+    m_text->SetFont( *wxITALIC_FONT );

 }
 
 void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 {
 }
 
 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 )
 {
 void MyPanel::OnSpinUpdate( wxSpinEvent &event )
 {

-  wxString value;
-  value.sprintf( "%d", (int)event.GetPosition() );
-  m_spintext->SetValue( value );
+    wxString value;
+    value.Printf( _T("%d"), event.GetPosition() );
+    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);
+        }
+    }
+
+    if ( !cont )
+    {
+        *m_text << "Progress dialog aborted!\n";
+    }
+    else
+    {
+        *m_text << "Countdown from " << max << " finished.\n";
+    }
+}
+
+#endif // wxUSE_SPINBUTTON
+

 MyPanel::~MyPanel()
 {
 MyPanel::~MyPanel()
 {

-  delete m_notebook->GetImageList();
+    delete m_notebook->GetImageList();

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -836,14 +820,18 @@ MyPanel::~MyPanel()
 //----------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 //----------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(MINIMAL_QUIT,   MyFrame::OnQuit)
-    EVT_MENU(MINIMAL_ABOUT,  MyFrame::OnAbout)
-    EVT_SIZE(MyFrame::OnSize)
-    EVT_IDLE(MyFrame::OnIdle)
+EVT_MENU(MINIMAL_QUIT,   MyFrame::OnQuit)
+EVT_MENU(MINIMAL_ABOUT,  MyFrame::OnAbout)
+#if wxUSE_TOOLTIPS
+EVT_MENU(MINIMAL_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
+EVT_MENU(MINIMAL_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)
+#endif // wxUSE_TOOLTIPS
+EVT_SIZE(MyFrame::OnSize)
+EVT_IDLE(MyFrame::OnIdle)

 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)

-       : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))

 {
     CreateStatusBar(2);
 
 {
     CreateStatusBar(2);
 


@@ -852,19 +840,57 @@ MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 {

-  Close(TRUE);
+    Close(TRUE);

 }
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {

-  wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
-  dialog.ShowModal();
+    wxBeginBusyCursor();
+
+    wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
+    dialog.ShowModal();
+
+    wxEndBusyCursor();
+}
+
+#if wxUSE_TOOLTIPS
+void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
+{
+    static long s_delay = 5000;
+
+    wxString delay;
+    delay.Printf( _T("%ld"), s_delay);
+
+    delay = wxGetTextFromUser("Enter delay (in milliseconds)",
+            "Set tooltip delay",
+            delay,
+            this);
+    if ( !delay )
+        return; // cancelled
+
+    wxSscanf(delay, _T("%ld"), &s_delay);
+
+    wxToolTip::SetDelay(s_delay);
+
+    wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
+}
+
+void MyFrame::OnToggleTooltips(wxCommandEvent& event)
+{
+    static bool s_enabled = TRUE;
+
+    s_enabled = !s_enabled;
+
+    wxToolTip::Enable(s_enabled);
+
+    wxLogStatus(this, _T("Tooltips %sabled"), s_enabled ? _T("en") : _T("dis") );

 }
 }

+#endif // tooltips

 
 void MyFrame::OnSize( wxSizeEvent& event )
 {
     wxString msg;
 
 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();


@@ -880,14 +906,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__
 #ifdef __WXMSW__

-                   , s_windowFocus->GetHWND()
-#endif // wxMSW
+                , s_windowFocus->GetHWND()
+#endif

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