compilation fix for recent commit

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 8b10682e5f67dfe91597c87d5496103a8fb106b6..8c696f260ecc9cddb7cc012406a985d58e4ad10c 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -23,21 +23,18 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+#if !defined( __WXMSW__ ) || defined( __WIN95__ )

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

+#endif
+#include "wx/tglbtn.h"

 #include "wx/notebook.h"
 #include "wx/imaglist.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"
 #endif
 
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)

     #define USE_XPM
 #endif
 
     #define USE_XPM
 #endif
 


@@ -51,6 +48,24 @@
     #include "icons/gauge.xpm"
 #endif
 
     #include "icons/gauge.xpm"
 #endif
 

+#ifdef __WIN16__
+    // Win16 doesn't have them
+    #ifdef wxUSE_SPINBTN
+    #undef wxUSE_SPINBTN
+    #endif
+    #define wxUSE_SPINBTN 0
+#else
+    #ifndef wxUSE_SPINBTN
+    #define wxUSE_SPINBTN 1
+    #endif
+#endif // __WIN16__
+
+#include "wx/progdlg.h"
+
+#if wxUSE_SPINCTRL
+    #include "wx/spinctrl.h"
+#endif // wxUSE_SPINCTRL
+

 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------


@@ -61,166 +76,265 @@ 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:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();
 class MyPanel: public wxPanel
 {
 public:
     MyPanel(wxFrame *frame, int x, int y, int w, int h);
     virtual ~MyPanel();

-    
+

     void OnSize( wxSizeEvent& event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnListBoxButtons( wxCommandEvent &event );
     void OnSize( wxSizeEvent& event );
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnListBoxButtons( wxCommandEvent &event );

+#if wxUSE_CHOICE

     void OnChoice( wxCommandEvent &event );
     void OnChoiceButtons( wxCommandEvent &event );
     void OnChoice( wxCommandEvent &event );
     void OnChoiceButtons( wxCommandEvent &event );

+#endif

     void OnCombo( wxCommandEvent &event );
     void OnCombo( wxCommandEvent &event );

+    void OnComboTextChanged( wxCommandEvent &event );
+    void OnComboTextEnter( wxCommandEvent &event );

     void OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &event );
     void OnRadioButtons( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );
     void OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &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 );

+    void OnUpdateLabel( wxCommandEvent &event );
+#if wxUSE_SPINBTN
+    void OnSpinUp( wxSpinEvent &event );
+    void OnSpinDown( wxSpinEvent &event );

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

-    void OnPasteFromClipboard( wxCommandEvent &event );
-    void OnCopyToClipboard( wxCommandEvent &event );
-    void OnMoveToEndOfText( wxCommandEvent &event );
-    void OnMoveToEndOfEntry( wxCommandEvent &event );
-    
-    wxListBox     *m_listbox;
-    wxChoice      *m_choice;
+    void OnUpdateShowProgress( wxUpdateUIEvent& event );
+    void OnShowProgress( wxCommandEvent &event );
+#endif // wxUSE_SPINBTN
+
+#if wxUSE_SPINCTRL
+    void OnSpinCtrl(wxSpinEvent& event);
+#endif // wxUSE_SPINCTRL
+
+    void OnEnableAll(wxCommandEvent& event);
+    void OnChangeColour(wxCommandEvent& event);
+    void OnTestButton(wxCommandEvent& event);
+    void OnBmpButton(wxCommandEvent& event);
+
+    wxListBox     *m_listbox,
+                  *m_listboxSorted;
+#if wxUSE_CHOICE
+    wxChoice      *m_choice,
+                  *m_choiceSorted;
+#endif

     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;

-    wxGauge       *m_gauge;
+    wxGauge       *m_gauge,
+                  *m_gaugeVert;

     wxSlider      *m_slider;
     wxButton      *m_fontButton;
     wxSlider      *m_slider;
     wxButton      *m_fontButton;

+    wxButton      *m_lbSelectNum;
+    wxButton      *m_lbSelectThis;
+#if wxUSE_SPINBTN

     wxSpinButton  *m_spinbutton;
     wxSpinButton  *m_spinbutton;

+    wxButton      *m_btnProgress;
+#endif // wxUSE_SPINBTN
+
+#if wxUSE_SPINCTRL
+    wxSpinCtrl    *m_spinctrl;
+#endif // wxUSE_SPINCTRL
+

     wxTextCtrl    *m_spintext;
     wxTextCtrl    *m_spintext;

-    MyTextCtrl    *m_multitext;
-    MyTextCtrl    *m_textentry;

     wxCheckBox    *m_checkbox;
     wxCheckBox    *m_checkbox;

-    
+

     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 
     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 

+    wxStaticText  *m_label;
+

 private:
 private:

+    wxLog *m_logTargetOld;
+

     DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {
 public:
     DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {
 public:

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

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

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

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

+    void OnMove( wxMoveEvent& event );
+
+    MyPanel *GetPanel() const { return m_panel; }

 
 private:
 
 private:

+    void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
+    {
+        if ( m_frameStatusBar )
+        {
+            wxString msg;
+            wxSize sizeCl = GetClientSize();
+            msg.Printf(_("pos=(%d, %d), size=%dx%d (client=%dx%d)"),
+                       pos.x, pos.y,
+                       size.x, size.y,
+                       sizeCl.x, sizeCl.y);
+            SetStatusText(msg, 1);
+        }
+    }
+
+    MyPanel *m_panel;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-//----------------------------------------------------------------------
-// main()
-//----------------------------------------------------------------------
+// a button which intercepts double clicks (for testing...)
+class MyButton : public wxButton
+{
+public:
+    MyButton(wxWindow *parent,
+             wxWindowID id,
+             const wxString& label = wxEmptyString,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize)
+        : wxButton(parent, id, label, pos, size)
+    {
+    }

 
 

-IMPLEMENT_APP(MyApp)
+    void OnDClick(wxMouseEvent& event)
+    {
+        wxLogMessage(_T("MyButton::OnDClick"));

 
 

-//----------------------------------------------------------------------
-// MyApp
-//----------------------------------------------------------------------
+        event.Skip();
+    }

 
 

-const   int MINIMAL_QUIT   = 100;
-const   int MINIMAL_TEXT   = 101;
-const   int MINIMAL_ABOUT  = 102;
+private:
+    DECLARE_EVENT_TABLE()
+};

 
 

-bool MyApp::OnInit()
+// a combo which intercepts chars (to test Windows behaviour)
+class MyComboBox : public wxComboBox

 {
 {

-  // Create the main frame window
-  MyFrame *frame = new MyFrame((wxFrame *) NULL,
-                               "Controls wxWindows App",
-                               50, 50, 530, 420);
+public:
+    MyComboBox(wxWindow *parent, wxWindowID id,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr)
+        : wxComboBox(parent, id, value, pos, size, n, choices, style,
+                     validator, name) { }
+
+protected:
+    void OnChar(wxKeyEvent& event);
+    void OnKeyDown(wxKeyEvent& event);
+    void OnKeyUp(wxKeyEvent& event);
+    void OnFocusGot(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyComboBox::OnFocusGot"));

 
 

-  // 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
+        event.Skip();
+    }

 
 

-  frame->SetIcon( wxICON(mondrian) );
+private:
+    DECLARE_EVENT_TABLE()
+};

 
 

-  wxMenu *file_menu = new wxMenu;
+// a radiobox which handles focus set/kill (for testing)
+class MyRadioBox : public wxRadioBox
+{
+public:
+    MyRadioBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& title = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               int majorDim = 1,
+               long style = wxRA_HORIZONTAL,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+        : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim,
+                     style, validator, name) { }
+
+protected:
+    void OnFocusGot(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyRadioBox::OnFocusGot"));

 
 

-  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);
+        event.Skip();
+    }

 
 

-  frame->Show(TRUE);
+    void OnFocusLost(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyRadioBox::OnFocusLost"));

 
 

-  SetTopWindow(frame);
+        event.Skip();
+    }

 
 

-  return TRUE;
-}
+private:
+    DECLARE_EVENT_TABLE()
+};

 
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------

-// MyTextCtrl
+// other

 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
-    EVT_KEY_DOWN(MyTextCtrl::OnKeyDown)
-END_EVENT_TABLE()
+static void SetListboxClientData(const wxChar *name, wxListBox *control);
+static void SetChoiceClientData(const wxChar *name, wxChoice *control);

 
 

-void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
+IMPLEMENT_APP(MyApp)
+
+//----------------------------------------------------------------------
+// MyApp
+//----------------------------------------------------------------------
+
+enum

 {
 {

-    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;
+    CONTROLS_QUIT   = 100,
+    CONTROLS_TEXT,
+    CONTROLS_ABOUT,
+    CONTROLS_CLEAR_LOG,

 
 

-        case WXK_F2:
-            // go to the end
-            SetInsertionPointEnd();
-            break;
+    // tooltip menu
+    CONTROLS_SET_TOOLTIP_DELAY = 200,
+    CONTROLS_ENABLE_TOOLTIPS,

 
 

-        case WXK_F3:
-            // go to position 10
-            SetInsertionPoint(10);
-            break;
+    // panel menu
+    CONTROLS_ENABLE_ALL
+};

 
 

-        default:
-            event.Skip();
+bool MyApp::OnInit()
+{
+    // use standard command line handling:
+    if ( !wxApp::OnInit() )
+        return FALSE;
+
+    // parse the cmd line
+    int x = 50,
+        y = 50;
+    if ( argc == 3 )
+    {
+        wxSscanf(wxString(argv[1]), wxT("%d"), &x);
+        wxSscanf(wxString(argv[2]), wxT("%d"), &y);

     }
     }

+
+    // Create the main frame window
+    MyFrame *frame = new MyFrame("Controls wxWindows App", x, y);
+    frame->Show(TRUE);
+
+    return TRUE;

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


@@ -237,6 +351,7 @@ const int  ID_LISTBOX_APPEND    = 134;
 const int  ID_LISTBOX_DELETE    = 135;
 const int  ID_LISTBOX_FONT      = 136;
 const int  ID_LISTBOX_ENABLE    = 137;
 const int  ID_LISTBOX_DELETE    = 135;
 const int  ID_LISTBOX_FONT      = 136;
 const int  ID_LISTBOX_ENABLE    = 137;

+const int  ID_LISTBOX_SORTED    = 138;

 
 const int  ID_CHOICE            = 120;
 const int  ID_CHOICE_SEL_NUM    = 121;
 
 const int  ID_CHOICE            = 120;
 const int  ID_CHOICE_SEL_NUM    = 121;


@@ -246,6 +361,7 @@ const int  ID_CHOICE_APPEND     = 124;
 const int  ID_CHOICE_DELETE     = 125;
 const int  ID_CHOICE_FONT       = 126;
 const int  ID_CHOICE_ENABLE     = 127;
 const int  ID_CHOICE_DELETE     = 125;
 const int  ID_CHOICE_FONT       = 126;
 const int  ID_CHOICE_ENABLE     = 127;

+const int  ID_CHOICE_SORTED     = 128;

 
 const int  ID_COMBO             = 140;
 const int  ID_COMBO_SEL_NUM     = 141;
 
 const int  ID_COMBO             = 140;
 const int  ID_COMBO_SEL_NUM     = 141;


@@ -256,12 +372,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;


@@ -277,113 +387,167 @@ 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;
+const int  ID_BUTTON_LABEL      = 184;
+const int  ID_SPINCTRL          = 185;
+
+const int  ID_BUTTON_TEST1      = 190;
+const int  ID_BUTTON_TEST2      = 191;
+const int  ID_BITMAP_BTN        = 192;
+
+const int  ID_CHANGE_COLOUR     = 200;

 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 
 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   (ID_LISTBOX_SORTED,       MyPanel::OnListBox)
+EVT_LISTBOX_DCLICK(ID_LISTBOX,          MyPanel::OnListBoxDoubleClick)
+EVT_BUTTON    (ID_LISTBOX_SEL_NUM,      MyPanel::OnListBoxButtons)
+EVT_BUTTON    (ID_LISTBOX_SEL_STR,      MyPanel::OnListBoxButtons)
+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)
+#if wxUSE_CHOICE
+EVT_CHOICE    (ID_CHOICE,               MyPanel::OnChoice)
+EVT_CHOICE    (ID_CHOICE_SORTED,        MyPanel::OnChoice)
+EVT_BUTTON    (ID_CHOICE_SEL_NUM,       MyPanel::OnChoiceButtons)
+EVT_BUTTON    (ID_CHOICE_SEL_STR,       MyPanel::OnChoiceButtons)
+EVT_BUTTON    (ID_CHOICE_CLEAR,         MyPanel::OnChoiceButtons)
+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)
+#endif
+EVT_COMBOBOX  (ID_COMBO,                MyPanel::OnCombo)
+EVT_TEXT      (ID_COMBO,                MyPanel::OnComboTextChanged)
+EVT_TEXT_ENTER(ID_COMBO,                MyPanel::OnComboTextEnter)
+EVT_BUTTON    (ID_COMBO_SEL_NUM,        MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_SEL_STR,        MyPanel::OnComboButtons)
+EVT_BUTTON    (ID_COMBO_CLEAR,          MyPanel::OnComboButtons)
+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)
+#if wxUSE_SPINBTN
+EVT_SPIN      (ID_SPIN,                 MyPanel::OnSpinUpdate)
+EVT_SPIN_UP   (ID_SPIN,                 MyPanel::OnSpinUp)
+EVT_SPIN_DOWN (ID_SPIN,                 MyPanel::OnSpinDown)
+EVT_UPDATE_UI (ID_BTNPROGRESS,          MyPanel::OnUpdateShowProgress)
+EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
+#endif // wxUSE_SPINBTN
+#if wxUSE_SPINCTRL
+EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
+#endif // wxUSE_SPINCTRL
+#if wxUSE_TOGGLEBTN
+EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
+#endif // wxUSE_TOGGLEBTN
+EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
+EVT_BUTTON    (ID_BUTTON_TEST1,         MyPanel::OnTestButton)
+EVT_BUTTON    (ID_BUTTON_TEST2,         MyPanel::OnTestButton)
+EVT_BUTTON    (ID_BITMAP_BTN,           MyPanel::OnBmpButton)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyButton, wxButton)
+    EVT_LEFT_DCLICK(MyButton::OnDClick)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyComboBox, wxComboBox)
+    EVT_CHAR(MyComboBox::OnChar)
+    EVT_KEY_DOWN(MyComboBox::OnKeyDown)
+    EVT_KEY_UP(MyComboBox::OnKeyUp)
+
+    EVT_SET_FOCUS(MyComboBox::OnFocusGot)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyRadioBox, wxRadioBox)
+    EVT_SET_FOCUS(MyRadioBox::OnFocusGot)
+    EVT_KILL_FOCUS(MyRadioBox::OnFocusLost)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+// ============================================================================
+// implementation
+// ============================================================================
+

 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
          m_text(NULL), m_notebook(NULL)
 {
 MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
        : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
          m_text(NULL), m_notebook(NULL)
 {

-//  SetBackgroundColour("cadet blue");
+    wxLayoutConstraints *c;
+
+    m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
+                            wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
+    m_text->SetBackgroundColour(wxT("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");
+    if ( 0 )
+        wxLog::AddTraceMask(_T("focus"));
+    m_logTargetOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_text));

 
 

-  m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
+    m_notebook = new wxNotebook(this, ID_NOTEBOOK);

 
 

-  wxString choices[] =
-  {
-    "This",
-    "is one of my",
-    "really",
-    "wonderful",
-    "examples."
-  };
+    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(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);
+    // 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(wxT("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


@@ -394,459 +558,769 @@ 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;
+    wxPanel *panel = new wxPanel(m_notebook);
+    m_listbox = new wxListBox( panel, ID_LISTBOX,
+                               wxPoint(10,10), wxSize(120,70),
+                               5, choices, wxLB_ALWAYS_SB );
+    m_listboxSorted = new wxListBox( panel, ID_LISTBOX_SORTED,
+                                     wxPoint(10,90), wxSize(120,70),
+                                     5, choices, wxLB_SORT );
+
+    SetListboxClientData(wxT("listbox"), m_listbox);
+    SetListboxClientData(wxT("listbox"), m_listboxSorted);

 
 

-  panel = new wxPanel(m_notebook);
-  m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 5, choices );
+    m_listbox->SetCursor(*wxCROSS_CURSOR);

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-  m_listbox->SetToolTip( "This is a list box" );
-#endif
+    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 MyButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_LISTBOX_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+    wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+
+    button->SetDefault();
+
+    button->SetForegroundColour(*wxBLUE);

 
 

-  (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) );

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-  button->SetToolTip( "Press here to set italic font" );
-#endif
+    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->SetValue(FALSE);
+    m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,170) );
+    m_checkbox->SetValue(FALSE);

 #if wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS

-  m_checkbox->SetToolTip( "Click here to disable the listbox" );
-#endif
-  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) );
+    m_checkbox->SetToolTip( "Click here to disable the listbox" );
+#endif // wxUSE_TOOLTIPS
+    (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour",
+                          wxPoint(110,170) );
+    panel->SetCursor(wxCursor(wxCURSOR_HAND));
+    m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);
+
+#if wxUSE_CHOICE
+    panel = new wxPanel(m_notebook);
+    m_choice = new wxChoice( panel, ID_CHOICE, wxPoint(10,10), wxSize(120,-1), 5, choices );
+    m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
+                                   5, choices, wxCB_SORT );
+
+    SetChoiceClientData(wxT("choice"), m_choice);
+    SetChoiceClientData(wxT("choice"), m_choiceSorted);
+
+    m_choice->SetSelection(2);
+    m_choice->SetBackgroundColour( wxT("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, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
+
+    m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
+#endif // wxUSE_CHOICE
+
+    panel = new wxPanel(m_notebook);
+    (void)new wxStaticBox( panel, -1, "&Box around combobox",
+                           wxPoint(5, 5), wxSize(150, 100));
+    m_combo = new MyComboBox( panel, ID_COMBO, "This",
+                              wxPoint(20,25), wxSize(120, -1),
+                              5, choices,
+                              /* wxCB_READONLY | */ wxPROCESS_ENTER);
+
+    (void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) );
+    m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
+
+    wxString choices2[] =
+    {
+        "First", "Second",
+        /* "Third",
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */
+    };
+
+    panel = new wxPanel(m_notebook);
+    (void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
+    m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
+
+#if wxUSE_TOOLTIPS
+    m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?");
+    m_radio->SetToolTip("Ever seen a radiobox?");
+#endif // wxUSE_TOOLTIPS
+
+    (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) );
+    m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize );
+    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
+    rb->SetValue( FALSE );
+    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize );
+    m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
+
+    panel = new wxPanel(m_notebook);
+    (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(222,130) );
+    m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
+    m_gauge->SetBackgroundColour(*wxGREEN);
+    m_gauge->SetForegroundColour(*wxRED);
+    m_gaugeVert = new wxGauge( panel, -1, 100,
+                               wxPoint(195,35), wxSize(30, 90),
+                               wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER );
+    m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1),
+                             wxSL_AUTOTICKS | wxSL_LABELS );
+    m_slider->SetTickFreq(40, 0);
+    (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(230,10), wxSize(270,130) );

 #ifdef __WXMOTIF__
 #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(250,30),
+                            wxSize(240, -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(250,25),
+                            wxSize(240, 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) )
-{
-#if wxUSE_CLIPBOARD
-  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.");
+    int initialSpinValue = -5;
+    wxString s;
+    s << initialSpinValue;
+    m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) );
+#if wxUSE_SPINBTN
+    m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) );
+    m_spinbutton->SetRange(-10,30);
+    m_spinbutton->SetValue(initialSpinValue);
+
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",
+                                  wxPoint(300, 160) );
+#endif // wxUSE_SPINBTN
+
+#if wxUSE_SPINCTRL
+    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, "", wxPoint(200, 160), wxSize(80, -1) );
+    m_spinctrl->SetRange(10,30);
+    m_spinctrl->SetValue(15);
+#endif // wxUSE_SPINCTRL
+
+    m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
+
+    panel = new wxPanel(m_notebook);
+
+#if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
+    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
+    wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
+                                                   wxPoint(10, 10));
+
+    bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
+    bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
+#endif // !Motif
+
+    wxBitmap bitmap( 100, 100 );
+    wxMemoryDC dc;
+    dc.SelectObject( bitmap );
+    dc.SetPen(*wxGREEN_PEN);
+    dc.Clear();
+    dc.DrawEllipse(5, 5, 90, 90);
+    dc.DrawText("Bitmap", 30, 40);
+    dc.SelectObject( wxNullBitmap );
+
+    (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
+
+#ifdef __WXMSW__
+    // test for masked bitmap display
+    bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP);
+    if (bitmap.Ok())
+    {
+       bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+
+       (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
+    }

 #endif
 #endif

-}

 
 

-void MyPanel::OnCopyToClipboard( wxCommandEvent &WXUNUSED(event) )
-{
-#if wxUSE_CLIPBOARD
-  wxString text( m_multitext->GetLineText(0) );
+    wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
+             bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
+             bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));
+    wxBitmapButton *bmpBtn = new wxBitmapButton
+                                 (
+                                  panel, -1,
+                                  bmp1,
+                                  wxPoint(30, 70)
+                                 );

 
 

-  if (text.IsEmpty())
-  {
-      *m_text << "No text to copy.\n";
+    bmpBtn->SetBitmapSelected(bmp2);
+    bmpBtn->SetBitmapFocus(bmp3);

 
 

-      return;
-  }
+#if wxUSE_TOGGLEBTN
+    (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
+                             "&Toggle label", wxPoint(250, 20));
+#endif // wxUSE_TOGGLEBTN

 
 

-  if (!wxTheClipboard->Open())
-  {
-     *m_text << "Error opening the clipboard.\n";
+    m_label = new wxStaticText(panel, -1, "Label with some long text",
+                               wxPoint(250, 60), wxDefaultSize,
+                               wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
+    m_label->SetForegroundColour( *wxBLUE );

 
 

-     return;
-  }
-  else
-  {
-     *m_text << "Successfully opened the clipboard.\n";
-  }
+    m_notebook->AddPage(panel, "wxBitmapXXX");

 
 

-  wxTextDataObject *data = new wxTextDataObject( text );
+    // layout constraints

 
 

-  if (!wxTheClipboard->SetData( data ))
-  {
-     *m_text << "Error while copying to the clipboard.\n";
-  }
-  else
-  {
-     *m_text << "Successfully copied data to the clipboard.\n";
-  }
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );

 
 

-  wxTheClipboard->Close();
+    c = new wxLayoutConstraints;
+    c->top.SameAs( panel, wxTop, 10 );
+    c->height.AsIs( );
+    c->left.SameAs( panel, wxLeft, 10 );
+    c->width.PercentOf( panel, wxWidth, 40 );

 
 

-  *m_text << "Closed the clipboard.\n";
-#else
-  wxLogError("Your version of wxWindows is compiled without clipboard support.");
-#endif
-}
+    wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" );
+    pMyButton->SetConstraints( c );

 
 

-void MyPanel::OnMoveToEndOfText( wxCommandEvent &event )
-{
-    m_multitext->SetInsertionPointEnd();
-    m_multitext->SetFocus();
+    c = new wxLayoutConstraints;
+    c->top.SameAs( panel, wxTop, 10 );
+    c->bottom.SameAs( panel, wxBottom, 10 );
+    c->right.SameAs( panel, wxRight, 10 );
+    c->width.PercentOf( panel, wxWidth, 40 );
+
+    wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" );
+    pMyButton2->SetConstraints( c );
+
+    m_notebook->AddPage(panel, "wxLayoutConstraint");
+
+    // sizer
+
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );
+
+    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+
+    sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );
+    sizer->Add( 20,20, 1 );
+    sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 );
+
+    panel->SetSizer( sizer );
+
+    m_notebook->AddPage(panel, "wxSizer");

 }
 
 }
 

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

 {
 {

-    m_textentry->SetInsertionPointEnd();
-    m_textentry->SetFocus();
+    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::OnSize( wxSizeEvent& WXUNUSED(event) )
+void MyPanel::OnPageChanging( wxNotebookEvent &event )

 {
 {

-  int x = 0;
-  int y = 0;
-  GetClientSize( &x, &y );
+    int selOld = event.GetOldSelection();
+    if ( selOld == 2 )
+    {
+        if ( wxMessageBox("This demonstrates how a program may prevent the\n"
+                          "page change from taking place - if you select\n"
+                          "[No] the current page will stay the third one\n",
+                          "Control sample",
+                          wxICON_QUESTION | wxYES_NO, this) != wxYES )
+        {
+            event.Veto();
+
+            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
+            << " to " << event.GetSelection()
+            << " (current page from notebook is "
+            << m_notebook->GetSelection() << ")\n";

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

-  *m_text << "Notebook selection is " << event.GetSelection() << "\n";
+    *m_text << "Notebook selection is now " << event.GetSelection()
+            << " (from notebook: " << m_notebook->GetSelection() << ")\n";

 }
 
 }
 

-void MyPanel::OnListBox( wxCommandEvent &event )
+void MyPanel::OnTestButton(wxCommandEvent& event)

 {
 {

-  m_text->AppendText( "ListBox selection string is: " );
-  m_text->AppendText( event.GetString() );
-  m_text->AppendText( "\n" );
+    wxLogMessage(_T("Button %c clicked."),
+                 event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));

 }
 
 }
 

-void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
+void MyPanel::OnBmpButton(wxCommandEvent& event)

 {
 {

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

 }
 
 }
 

-void MyPanel::OnListBoxButtons( wxCommandEvent &event )
+void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))

 {
 {

-  switch (event.GetId())
-  {
-    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
-      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:
+    static wxColour s_colOld;
+
+    // test panel colour changing and propagation to the subcontrols
+    if ( s_colOld.Ok() )

     {
     {

-      m_listbox->Clear();
-      break;
+        SetBackgroundColour(s_colOld);
+        s_colOld = wxNullColour;
+
+        m_lbSelectThis->SetForegroundColour(wxT("red"));
+        m_lbSelectThis->SetBackgroundColour(wxT("white"));

     }
     }

-    case ID_LISTBOX_APPEND:
+    else

     {
     {

-      m_listbox->Append( "Hi!" );
-      break;
+        s_colOld = wxColour(wxT("red"));
+        SetBackgroundColour(wxT("white"));
+
+        m_lbSelectThis->SetForegroundColour(wxT("white"));
+        m_lbSelectThis->SetBackgroundColour(wxT("red"));

     }
     }

-    case ID_LISTBOX_DELETE:
+
+    m_lbSelectThis->Refresh();
+    Refresh();
+}
+
+void MyPanel::OnListBox( wxCommandEvent &event )
+{
+//    GetParent()->Move(100, 100);
+
+    if (event.GetInt() == -1)

     {
     {

-      int idx = m_listbox->GetSelection();
-      m_listbox->Delete( idx );
-      break;
+        m_text->AppendText( "ListBox has no selections anymore\n" );
+        return;

     }
     }

-    case ID_LISTBOX_FONT:
+
+    wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
+                                                     : m_listboxSorted;
+
+    m_text->AppendText( "ListBox event selection string is: '" );
+    m_text->AppendText( event.GetString() );
+    m_text->AppendText( "'\n" );
+    m_text->AppendText( "ListBox control selection string is: '" );
+    m_text->AppendText( listbox->GetStringSelection() );
+    m_text->AppendText( "'\n" );
+
+    wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
+    m_text->AppendText( "ListBox event client data string is: '" );
+    if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
+        m_text->AppendText( obj->GetData() );
+    else
+        m_text->AppendText( wxString("none") );
+
+    m_text->AppendText( "'\n" );
+    m_text->AppendText( "ListBox control client data string is: '" );
+    obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
+    if (obj)
+        m_text->AppendText( obj->GetData() );
+    else
+        m_text->AppendText( wxString("none") );
+    m_text->AppendText( "'\n" );
+}
+
+void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
+{
+    m_text->AppendText( "ListBox double click string is: " );
+    m_text->AppendText( event.GetString() );
+    m_text->AppendText( "\n" );
+}
+
+void MyPanel::OnListBoxButtons( wxCommandEvent &event )
+{
+    switch (event.GetId())

     {
     {

-      m_listbox->SetFont( *wxITALIC_FONT );
-      m_checkbox->SetFont( *wxITALIC_FONT );
-      break;
+        case ID_LISTBOX_ENABLE:
+            {
+                m_text->AppendText("Checkbox clicked.\n");
+#if wxUSE_TOOLTIPS
+                wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
+                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 );
+                m_lbSelectThis->Enable( event.GetInt() == 0 );
+                m_lbSelectNum->Enable( event.GetInt() == 0 );
+                m_listboxSorted->Enable( event.GetInt() == 0 );
+                FindWindow(ID_CHANGE_COLOUR)->Enable( event.GetInt() == 0 );
+                break;
+            }
+        case ID_LISTBOX_SEL_NUM:
+            {
+                m_listbox->SetSelection( 2 );
+                m_listboxSorted->SetSelection( 2 );
+                m_lbSelectThis->WarpPointer( 40, 14 );
+                break;
+            }
+        case ID_LISTBOX_SEL_STR:
+            {
+                m_listbox->SetStringSelection( "This" );
+                m_listboxSorted->SetStringSelection( "This" );
+                m_lbSelectNum->WarpPointer( 40, 14 );
+                break;
+            }
+        case ID_LISTBOX_CLEAR:
+            {
+                m_listbox->Clear();
+                m_listboxSorted->Clear();
+                break;
+            }
+        case ID_LISTBOX_APPEND:
+            {
+                m_listbox->Append( "Hi!" );
+                m_listboxSorted->Append( "Hi!" );
+                break;
+            }
+        case ID_LISTBOX_DELETE:
+            {
+                int idx;
+                idx = m_listbox->GetSelection();
+                if ( idx != wxNOT_FOUND )
+                    m_listbox->Delete( idx );
+                idx = m_listboxSorted->GetSelection();
+                if ( idx != wxNOT_FOUND )
+                    m_listboxSorted->Delete( idx );
+                break;
+            }
+        case ID_LISTBOX_FONT:
+            {
+                m_listbox->SetFont( *wxITALIC_FONT );
+                m_listboxSorted->SetFont( *wxITALIC_FONT );
+                m_checkbox->SetFont( *wxITALIC_FONT );
+                break;
+            }

     }
     }

-  }

 }
 
 }
 

+#if wxUSE_CHOICE

 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" );
+    wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
+                                                  : m_choiceSorted;
+
+    m_text->AppendText( "Choice event selection string is: '" );
+    m_text->AppendText( event.GetString() );
+    m_text->AppendText( "'\n" );
+    m_text->AppendText( "Choice control selection string is: '" );
+    m_text->AppendText( choice->GetStringSelection() );
+    m_text->AppendText( "'\n" );
+
+    wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
+    m_text->AppendText( "Choice event client data string is: '" );
+
+    if (obj)
+       m_text->AppendText( obj->GetData() );
+    else
+       m_text->AppendText( wxString("none") );
+
+    m_text->AppendText( "'\n" );
+    m_text->AppendText( "Choice control client data string is: '" );
+    obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
+
+    if (obj)
+       m_text->AppendText( obj->GetData() );
+    else
+       m_text->AppendText( wxString("none") );
+    m_text->AppendText( "'\n" );

 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
 {
 }
 
 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:
-    {
-      m_choice->SetStringSelection( "This" );
-      break;
-    }
-    case ID_CHOICE_CLEAR:
+    switch (event.GetId())

     {
     {

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

     }
     }

-  }

 }
 }

+#endif // wxUSE_CHOICE

 
 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::OnComboTextChanged(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(_T("Text in the combobox changed: now is '%s'."),
+                 m_combo->GetValue().c_str());
+}
+
+void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
+                 m_combo->GetValue().c_str());

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

-  switch (event.GetId())
-  {
-    case ID_COMBO_ENABLE:
+    switch (event.GetId())

     {
     {

-      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;
+        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:
+    switch (event.GetId())

     {
     {

-      m_radio->Enable( event.GetInt() == 0 );
-      break;
-    }
-    case ID_RADIOBOX_SEL_NUM:
-    {
-      m_radio->SetSelection( 2 );
-      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;
+            }

     }
     }

-    case ID_RADIOBOX_SEL_STR:
+}
+
+void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
+{
+    m_fontButton->SetFont( *wxITALIC_FONT );
+    m_text->SetFont( *wxITALIC_FONT );
+}
+
+void MyPanel::OnUpdateLabel( wxCommandEvent &event )
+{
+    m_label->SetLabel(event.GetInt() ? "Very very very very very long text."
+                                     : "Shorter text.");
+}
+
+void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
+{
+    m_gauge->SetValue( m_slider->GetValue() );
+    m_gaugeVert->SetValue( m_slider->GetValue() / 2 );
+}
+
+#if wxUSE_SPINCTRL
+
+void MyPanel::OnSpinCtrl(wxSpinEvent& event)
+{
+    wxString s;
+    s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
+             m_spinctrl->GetValue(), event.GetInt());
+    m_text->AppendText(s);
+}
+
+#endif // wxUSE_SPINCTRL
+
+#if wxUSE_SPINBTN
+void MyPanel::OnSpinUp( wxSpinEvent &event )
+{
+    wxString value;
+    value.Printf( _T("Spin control up: current = %d\n"),
+                 m_spinbutton->GetValue());
+
+    if ( m_spinbutton->GetValue() > 17 )

     {
     {

-      m_radio->SetStringSelection( "This" );
-      break;
+        value += _T("Preventing the spin button from going above 17.\n");
+
+        event.Veto();

     }
     }

-    case ID_RADIOBOX_FONT:
+
+    m_text->AppendText(value);
+}
+
+void MyPanel::OnSpinDown( wxSpinEvent &event )
+{
+    wxString value;
+    value.Printf( _T("Spin control down: current = %d\n"),
+                 m_spinbutton->GetValue());
+
+    if ( m_spinbutton->GetValue() < -17 )

     {
     {

-      m_radio->SetFont( *wxITALIC_FONT );
-      break;
+        value += _T("Preventing the spin button from going below -17.\n");
+
+        event.Veto();

     }
     }

-  }
+
+    m_text->AppendText(value);

 }
 
 }
 

-void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnSpinUpdate( wxSpinEvent &event )

 {
 {

-  m_fontButton->SetFont( *wxITALIC_FONT );
-  m_text->SetFont( *wxITALIC_FONT );
+    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::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )

 {
 {

-  m_gauge->SetValue( m_slider->GetValue() );
+    event.Enable( m_spinbutton->GetValue() > 0 );

 }
 
 }
 

-void MyPanel::OnSpinUpdate( wxSpinEvent &event )
+void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )

 {
 {

-  wxString value;
-  value.sprintf( "%d", (int)event.GetPosition() );
-  m_spintext->SetValue( value );
+    int max = m_spinbutton->GetValue();
+    wxProgressDialog dialog("Progress dialog example",
+                            "An informative message",
+                            max,    // range
+                            this,   // parent
+                            wxPD_CAN_ABORT |
+                            wxPD_AUTO_HIDE |
+                            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 )
+        {
+            cont = dialog.Update(i, "That's all, folks!");
+        }
+        else if ( i == max / 2 )
+        {
+            cont = dialog.Update(i, "Only a half left (very long message)!");
+        }
+        else
+        {
+            cont = dialog.Update(i);
+        }
+    }
+
+    if ( !cont )
+    {
+        *m_text << "Progress dialog aborted!\n";
+    }
+    else
+    {
+        *m_text << "Countdown from " << max << " finished.\n";
+    }

 }
 
 }
 

+#endif // wxUSE_SPINBTN
+

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

-  delete m_notebook->GetImageList();
+    //wxLog::RemoveTraceMask(_T("focus"));
+    delete wxLog::SetActiveTarget(m_logTargetOld);
+
+    delete m_notebook->GetImageList();

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


@@ -854,36 +1328,136 @@ 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_MENU(CONTROLS_QUIT,   MyFrame::OnQuit)
+    EVT_MENU(CONTROLS_ABOUT,  MyFrame::OnAbout)
+    EVT_MENU(CONTROLS_CLEAR_LOG,  MyFrame::OnClearLog)
+#if wxUSE_TOOLTIPS
+    EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
+    EVT_MENU(CONTROLS_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)
+#endif // wxUSE_TOOLTIPS
+
+    EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)
+

     EVT_SIZE(MyFrame::OnSize)
     EVT_SIZE(MyFrame::OnSize)

+    EVT_MOVE(MyFrame::OnMove)
+

     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 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))
+MyFrame::MyFrame(const char *title, int x, int y)
+       : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430))

 {
 {

+    // 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
+
+    SetIcon( wxICON(mondrian) );
+
+    wxMenu *file_menu = new wxMenu;
+
+    file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L");
+    file_menu->AppendSeparator();
+    file_menu->Append(CONTROLS_ABOUT, "&About\tF1");
+    file_menu->AppendSeparator();
+    file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample");
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, "&File");
+
+#if wxUSE_TOOLTIPS
+    wxMenu *tooltip_menu = new wxMenu;
+    tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");
+    tooltip_menu->AppendSeparator();
+    tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
+            "enable/disable tooltips", TRUE);
+    tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);
+    menu_bar->Append(tooltip_menu, "&Tooltips");
+#endif // wxUSE_TOOLTIPS
+
+    wxMenu *panel_menu = new wxMenu;
+    panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E",
+                       "Enable/disable all panel controls", TRUE);
+    menu_bar->Append(panel_menu, "&Panel");
+
+    SetMenuBar(menu_bar);
+

     CreateStatusBar(2);
 
     CreateStatusBar(2);
 

-    (void)new MyPanel( this, 10, 10, 300, 100 );
+    m_panel = new MyPanel( this, 10, 10, 300, 100 );
+
+    SetSizeHints( 500, 425 );

 }
 
 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();
+    wxBusyCursor bc;
+
+    wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
+    dialog.ShowModal();
+}
+
+void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->m_text->Clear();
+}
+
+#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::OnEnableAll(wxCommandEvent& WXUNUSED(event))
+{
+    static bool s_enable = TRUE;
+
+    s_enable = !s_enable;
+    m_panel->Enable(s_enable);
+}
+
+void MyFrame::OnMove( wxMoveEvent& event )
+{
+    UpdateStatusBar(event.GetPosition(), GetSize());
+
+    event.Skip();

 }
 
 void MyFrame::OnSize( wxSizeEvent& event )
 {
 }
 
 void MyFrame::OnSize( wxSizeEvent& event )
 {

-    wxString msg;
-    msg.Printf("%dx%d", event.GetSize().x, event.GetSize().y);
-    SetStatusText(msg, 1);
+    UpdateStatusBar(GetPosition(), event.GetSize());

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -898,16 +1472,71 @@ 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: %s, HWND = %08x"),
+#else
+                _T("Focus: %s"),
+#endif
+                s_windowFocus->GetClassInfo()->GetClassName()

 #ifdef __WXMSW__
 #ifdef __WXMSW__

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

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

+
+void MyComboBox::OnChar(wxKeyEvent& event)
+{
+    wxLogMessage(_T("MyComboBox::OnChar"));
+
+    if ( event.KeyCode() == 'w' )
+        wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+    else
+        event.Skip();
+}
+
+void MyComboBox::OnKeyDown(wxKeyEvent& event)
+{
+    wxLogMessage(_T("MyComboBox::OnKeyDown"));
+
+    if ( event.KeyCode() == 'w' )
+        wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+    else
+        event.Skip();
+}
+
+void MyComboBox::OnKeyUp(wxKeyEvent& event)
+{
+    wxLogMessage(_T("MyComboBox::OnKeyUp"));
+
+    event.Skip();
+}
+
+static void SetListboxClientData(const wxChar *name, wxListBox *control)
+{
+    size_t count = control->GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxString s;
+        s.Printf(wxT("%s client data for '%s'"),
+                 name, control->GetString(n).c_str());
+
+        control->SetClientObject(n, new wxStringClientData(s));
+    }
+}
+
+static void SetChoiceClientData(const wxChar *name, wxChoice *control)
+{
+    size_t count = control->GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxString s;
+        s.Printf(wxT("%s client data for '%s'"),
+                 name, control->GetString(n).c_str());
+
+        control->SetClientObject(n, new wxStringClientData(s));
+    }
+}