]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/controls/controls.cpp
wxUSE_GUI=0 not needed anymore
[wxWidgets.git] / samples / controls / controls.cpp
index 91ee748916f0ff2d64c71656b92e82b8d0aa2ff6..d2f3693dfd0e360d923a1fd65e0fc3f07df7f530 100644 (file)
 #if !defined( __WXMSW__ ) || defined( __WIN95__ )
 #include "wx/spinbutt.h"
 #endif
+#include "wx/tglbtn.h"
 #include "wx/notebook.h"
 #include "wx/imaglist.h"
+#include "wx/artprov.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     #define USE_XPM
 #endif
 
 
 #ifdef __WIN16__
     // Win16 doesn't have them
-    #undef wxUSE_SPINBUTTON
-    #define wxUSE_SPINBUTTON 0
+    #ifdef wxUSE_SPINBTN
+    #undef wxUSE_SPINBTN
+    #endif
+    #define wxUSE_SPINBTN 0
 #else
-    #if !defined(wxUSE_SPINBUTTON)
-        #define wxUSE_SPINBUTTON 1
+    #ifndef wxUSE_SPINBTN
+    #define wxUSE_SPINBTN 1
     #endif
 #endif // __WIN16__
 
 #include "wx/progdlg.h"
 
-// VZ: this is a temp. hack, will remove soon
-#define wxUSE_SPINCTRL 1
-
 #if wxUSE_SPINCTRL
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
@@ -86,37 +87,64 @@ public:
     void OnListBox( wxCommandEvent &event );
     void OnListBoxDoubleClick( wxCommandEvent &event );
     void OnListBoxButtons( wxCommandEvent &event );
+#if wxUSE_CHOICE
     void OnChoice( wxCommandEvent &event );
     void OnChoiceButtons( wxCommandEvent &event );
+#endif
     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 OnRadioButton1( wxCommandEvent &event );
+    void OnRadioButton2( wxCommandEvent &event );
     void OnSetFont( wxCommandEvent &event );
     void OnPageChanged( wxNotebookEvent &event );
     void OnPageChanging( wxNotebookEvent &event );
     void OnSliderUpdate( wxCommandEvent &event );
-#if wxUSE_SPINBUTTON
+    void OnUpdateLabel( wxCommandEvent &event );
+#if wxUSE_SPINBTN
     void OnSpinUp( wxSpinEvent &event );
     void OnSpinDown( wxSpinEvent &event );
     void OnSpinUpdate( wxSpinEvent &event );
     void OnUpdateShowProgress( wxUpdateUIEvent& event );
     void OnShowProgress( wxCommandEvent &event );
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
+
+#if wxUSE_SPINCTRL
+    void OnSpinCtrl(wxSpinEvent& event);
+    void OnSpinCtrlUp(wxSpinEvent& event);
+    void OnSpinCtrlDown(wxSpinEvent& event);
+    void OnSpinCtrlText(wxCommandEvent& event);
+#endif // wxUSE_SPINCTRL
+
+    void OnEnableAll(wxCommandEvent& event);
+    void OnChangeColour(wxCommandEvent& event);
+    void OnTestButton(wxCommandEvent& event);
+    void OnBmpButton(wxCommandEvent& event);
+
+    void OnSizerCheck (wxCommandEvent &event);
+
+    wxListBox     *m_listbox,
+                  *m_listboxSorted;
+#if wxUSE_CHOICE
+    wxChoice      *m_choice,
+                  *m_choiceSorted;
+#endif // wxUSE_CHOICE
 
-    wxListBox     *m_listbox;
-    wxChoice      *m_choice;
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
-    wxGauge       *m_gauge;
+    wxGauge       *m_gauge,
+                  *m_gaugeVert;
     wxSlider      *m_slider;
     wxButton      *m_fontButton;
     wxButton      *m_lbSelectNum;
     wxButton      *m_lbSelectThis;
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
     wxSpinButton  *m_spinbutton;
     wxButton      *m_btnProgress;
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
     wxSpinCtrl    *m_spinctrl;
@@ -128,32 +156,166 @@ public:
     wxTextCtrl    *m_text;
     wxNotebook    *m_notebook;
 
+    wxStaticText  *m_label;
+
+    wxBoxSizer    *m_buttonSizer;
+    wxButton      *m_sizerBtn1;
+    wxButton      *m_sizerBtn2;
+    wxButton      *m_sizerBtn3;
+    wxButton      *m_sizerBtn4;
+    wxBoxSizer    *m_hsizer;
+    wxButton      *m_bigBtn;
+
 private:
+    wxLog *m_logTargetOld;
+
     DECLARE_EVENT_TABLE()
 };
 
 class MyFrame: public wxFrame
 {
 public:
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
+    MyFrame(const wxChar *title, int x, int y);
 
     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 OnMove( wxMoveEvent& event );
+
+    MyPanel *GetPanel() const { return m_panel; }
+
+private:
+    void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
+    {
+        if ( m_frameStatusBar )
+        {
+            wxString msg;
+            wxSize sizeAll = GetSize(),
+                   sizeCl = GetClientSize();
+            msg.Printf(_("pos=(%d, %d), size=%dx%d or %dx%d (client=%dx%d)"),
+                       pos.x, pos.y,
+                       size.x, size.y,
+                       sizeAll.x, sizeAll.y,
+                       sizeCl.x, sizeCl.y);
+            SetStatusText(msg, 1);
+        }
+    }
+
+    MyPanel *m_panel;
+
+    DECLARE_EVENT_TABLE()
+};
+
+// 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)
+    {
+    }
+
+    void OnDClick(wxMouseEvent& event)
+    {
+        wxLogMessage(_T("MyButton::OnDClick"));
+
+        event.Skip();
+    }
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// a combo which intercepts chars (to test Windows behaviour)
+class MyComboBox : public wxComboBox
+{
+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"));
+
+        event.Skip();
+    }
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+// 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) { SetForegroundColour(*wxRED); }
+
+protected:
+    void OnFocusGot(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyRadioBox::OnFocusGot"));
+
+        event.Skip();
+    }
+
+    void OnFocusLost(wxFocusEvent& event)
+    {
+        wxLogMessage(_T("MyRadioBox::OnFocusLost"));
+
+        event.Skip();
+    }
 
 private:
     DECLARE_EVENT_TABLE()
 };
 
 //----------------------------------------------------------------------
-// main()
+// other
 //----------------------------------------------------------------------
 
+static void SetListboxClientData(const wxChar *name, wxListBox *control);
+
+#if wxUSE_CHOICE
+static void SetChoiceClientData(const wxChar *name, wxChoice *control);
+#endif // wxUSE_CHOICE
+
 IMPLEMENT_APP(MyApp)
 
 //----------------------------------------------------------------------
@@ -162,51 +324,37 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
-    MINIMAL_QUIT   = 100,
-    MINIMAL_TEXT,
-    MINIMAL_ABOUT,
+    CONTROLS_QUIT   = 100,
+    CONTROLS_TEXT,
+    CONTROLS_ABOUT,
+    CONTROLS_CLEAR_LOG,
 
     // tooltip menu
-    MINIMAL_SET_TOOLTIP_DELAY = 200,
-    MINIMAL_ENABLE_TOOLTIPS
+    CONTROLS_SET_TOOLTIP_DELAY = 200,
+    CONTROLS_ENABLE_TOOLTIPS,
+
+    // panel menu
+    CONTROLS_ENABLE_ALL
 };
 
 bool MyApp::OnInit()
 {
-    // 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) );
-
-    wxMenu *file_menu = new wxMenu("",  wxMENU_TEAROFF );
-    file_menu->Append(MINIMAL_ABOUT, "&About\tF1");
-    file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample");
-
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, "&File");
-
-#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
-
-    frame->SetMenuBar(menu_bar);
+    // 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(_T("Controls wxWindows App"), x, y);
     frame->Show(TRUE);
-    frame->SetCursor(wxCursor(wxCURSOR_HAND));
-
-    SetTopWindow(frame);
 
     return TRUE;
 }
@@ -225,6 +373,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_SORTED    = 138;
 
 const int  ID_CHOICE            = 120;
 const int  ID_CHOICE_SEL_NUM    = 121;
@@ -234,6 +383,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_SORTED     = 128;
 
 const int  ID_COMBO             = 140;
 const int  ID_COMBO_SEL_NUM     = 141;
@@ -260,12 +410,28 @@ 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;
+
+const int  ID_SIZER_CHECK1      = 201;
+const int  ID_SIZER_CHECK2      = 202;
+const int  ID_SIZER_CHECK3      = 203;
+const int  ID_SIZER_CHECK4      = 204;
+const int  ID_SIZER_CHECK14     = 205;
+const int  ID_SIZER_CHECKBIG    = 206;
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
 EVT_SIZE      (                         MyPanel::OnSize)
 EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyPanel::OnPageChanging)
 EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK,  MyPanel::OnPageChanged)
 EVT_LISTBOX   (ID_LISTBOX,              MyPanel::OnListBox)
+EVT_LISTBOX   (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)
@@ -274,7 +440,9 @@ 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)
@@ -282,7 +450,10 @@ 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)
@@ -295,37 +466,108 @@ 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_RADIOBUTTON(ID_RADIOBUTTON_1,       MyPanel::OnRadioButton1)
+EVT_RADIOBUTTON(ID_RADIOBUTTON_2,       MyPanel::OnRadioButton2)
 EVT_BUTTON    (ID_SET_FONT,             MyPanel::OnSetFont)
 EVT_SLIDER    (ID_SLIDER,               MyPanel::OnSliderUpdate)
-#if wxUSE_SPINBUTTON
+#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
+#endif // wxUSE_SPINBTN
+#if wxUSE_SPINCTRL
+EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
+EVT_SPIN_UP   (ID_SPINCTRL,             MyPanel::OnSpinCtrlUp)
+EVT_SPIN_DOWN (ID_SPINCTRL,             MyPanel::OnSpinCtrlDown)
+EVT_TEXT      (ID_SPINCTRL,             MyPanel::OnSpinCtrlText)
+#endif // wxUSE_SPINCTRL
+#if wxUSE_TOGGLEBTN
+EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
+#else
+EVT_CHECKBOX(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)
+
+EVT_CHECKBOX  (ID_SIZER_CHECK1,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK2,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK3,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK4,         MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECK14,        MyPanel::OnSizerCheck)
+EVT_CHECKBOX  (ID_SIZER_CHECKBIG,       MyPanel::OnSizerCheck)
+
+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()
 
+// ============================================================================
+// 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)
+       : wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) )
 {
-    //  SetBackgroundColour("cadet blue");
+    m_listbox = NULL;
+    m_listboxSorted = NULL;
+#if wxUSE_CHOICE
+    m_choice = NULL;
+    m_choiceSorted = NULL;
+#endif
+    m_combo = NULL;
+    m_radio = NULL;
+    m_gauge = NULL;
+    m_gaugeVert = NULL;
+    m_slider = NULL;
+    m_fontButton = NULL;
+    m_lbSelectNum = NULL;
+    m_lbSelectThis = NULL;
+#if wxUSE_SPINBTN
+    m_spinbutton = NULL;
+    m_btnProgress = NULL;
+#endif // wxUSE_SPINBTN
+#if wxUSE_SPINCTRL
+    m_spinctrl = NULL;
+#endif // wxUSE_SPINCTRL
+    m_spintext = NULL;
+    m_checkbox = NULL;
+    m_text = NULL;
+    m_notebook = NULL;
+    m_label = NULL;
 
-    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, _T("This is the log window.\n"),
+                            wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
+    m_text->SetBackgroundColour(wxT("wheat"));
 
-    delete wxLog::SetActiveTarget(new wxLogStderr);
+    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."
+        _T("This"),
+        _T("is one of my"),
+        _T("really"),
+        _T("wonderful"),
+        _T("examples.")
     };
 
 #ifdef USE_XPM
@@ -336,9 +578,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     };
 
     // fill the image list
-    wxImageList *imagelist = new wxImageList(32, 32);
+    wxBitmap bmp(list_xpm);
 
-    imagelist-> Add( wxBitmap( list_xpm ));
+    wxImageList *imagelist = new wxImageList(bmp.GetWidth(), bmp.GetHeight());
+
+    imagelist-> Add( bmp );
     imagelist-> Add( wxBitmap( choice_xpm ));
     imagelist-> Add( wxBitmap( combo_xpm ));
     imagelist-> Add( wxBitmap( text_xpm ));
@@ -353,9 +597,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     };
     wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max);
 
-    static const char *s_iconNames[Image_Max] =
+    static const wxChar *s_iconNames[Image_Max] =
     {
-        "list", "choice", "combo", "text", "radio", "gauge"
+        _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"),
+        _T("gauge")
     };
 
     for ( size_t n = 0; n < Image_Max; n++ )
@@ -363,7 +608,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
         wxBitmap bmp(s_iconNames[n]);
         if ( !bmp.Ok() || (imagelist->Add(bmp) == -1) )
         {
-            wxLogWarning("Couldn't load the image '%s' for the notebook page %d.",
+            wxLogWarning(wxT("Couldn't load the image '%s' for the notebook page %d."),
                     s_iconNames[n], n);
         }
     }
@@ -382,100 +627,149 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
 #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, wxLB_ALWAYS_SB );
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 #if wxUSE_TOOLTIPS
-    m_listbox->SetToolTip( "This is a list box" );
+    m_listbox->SetToolTip( _T("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) );
+    m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+    m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_LISTBOX_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
+    (void)new MyButton( panel, ID_LISTBOX_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_LISTBOX_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
+    wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
+
+    button->SetDefault();
+
+    button->SetForegroundColour(*wxBLUE);
+
 #if wxUSE_TOOLTIPS
-    button->SetToolTip( "Press here to set italic font" );
+    button->SetToolTip( _T("Press here to set italic font") );
 #endif // wxUSE_TOOLTIPS
 
-    m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,130) );
+    m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
     m_checkbox->SetValue(FALSE);
 #if wxUSE_TOOLTIPS
-    m_checkbox->SetToolTip( "Click here to disable the listbox" );
+    m_checkbox->SetToolTip( _T("Click here to disable the listbox") );
 #endif // wxUSE_TOOLTIPS
-    m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);
+    (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
+                          wxPoint(110,170) );
+    panel->SetCursor(wxCursor(wxCURSOR_HAND));
+    m_notebook->AddPage(panel, _T("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_choice->SetSelection(2);
-    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_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
+                                   5, choices, wxCB_SORT );
 
-    m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
+    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, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
+
+    m_notebook->AddPage(panel, _T("wxChoice"), FALSE, Image_Choice);
+#endif // wxUSE_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);
+    (void)new wxStaticBox( panel, -1, _T("&Box around combobox"),
+                           wxPoint(5, 5), wxSize(150, 100));
+    m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
+                              wxPoint(20,25), wxSize(120, -1),
+                              5, choices,
+                              /* wxCB_READONLY | */ wxPROCESS_ENTER);
+
+    (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
+    (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
+    m_notebook->AddPage(panel, _T("wxComboBox"), FALSE, Image_Combo);
 
     wxString choices2[] =
     {
-        "First", "Second",
+        _T("First"), _T("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 );
+    (void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
+    m_radio = new wxRadioBox( panel, ID_RADIOBOX, _T("T&his"), wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
+    m_radio->SetForegroundColour(*wxRED);
+
+#if wxUSE_TOOLTIPS
+    m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));
+    m_radio->SetToolTip(_T("Ever seen a radiobox?"));
+#endif // wxUSE_TOOLTIPS
+
+    (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, _T("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
+    m_fontButton = new wxButton( panel, ID_SET_FONT, _T("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
+    (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
+    (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize );
+    wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, 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);
+    (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
+    m_notebook->AddPage(panel, _T("wxRadioBox"), FALSE, Image_Radio);
 
     panel = new wxPanel(m_notebook);
-    (void)new wxStaticBox( panel, -1, "wxGauge and wxSlider", wxPoint(10,10), wxSize(200,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(220,10), wxSize(270,130) );
+    (void)new wxStaticBox( panel, -1, _T("&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);
+#if wxUSE_TOOLTIPS
+    m_slider->SetToolTip(_T("This is a sliding slider"));
+#endif // wxUSE_TOOLTIPS
+
+    (void)new wxStaticBox( panel, -1, _T("&Explanation"),
+                           wxPoint(230,10), wxSize(270,130),
+                           wxALIGN_CENTER );
+
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(
     (void)new wxStaticText( panel, -1,
-                            "Drag the slider!",
-                            wxPoint(228,30),
+                            _T("Drag the slider!"),
+                            wxPoint(250,30),
                             wxSize(240, -1)
                           );
 #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(228,25),
+                            _T("In order see the gauge (aka progress bar)\n")
+                            _T("control do something you have to drag the\n")
+                            _T("handle of the slider to the right.\n")
+                            _T("\n")
+                            _T("This is also supposed to demonstrate how\n")
+                            _T("to use static controls.\n"),
+                            wxPoint(250,25),
                             wxSize(240, 110)
                           );
 #endif
@@ -483,53 +777,168 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     wxString s;
     s << initialSpinValue;
     m_spintext = new wxTextCtrl( panel, -1, s, wxPoint(20,160), wxSize(80,-1) );
-#if wxUSE_SPINBUTTON
+#if wxUSE_SPINBTN
     m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,160), wxSize(80, -1) );
-    m_spinbutton->SetRange(-10,30);
+    m_spinbutton->SetRange(-40,30);
     m_spinbutton->SetValue(initialSpinValue);
 
-    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog",
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"),
                                   wxPoint(300, 160) );
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
-    m_spinctrl = new wxSpinCtrl( panel, -1, wxPoint(200, 160), wxSize(80, -1) );
+    m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), 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);
+    m_notebook->AddPage(panel, _T("wxGauge"), FALSE, Image_Gauge);
 
     panel = new wxPanel(m_notebook);
 
-#ifndef __WXMOTIF__  // wxStaticBitmap not working under Motif yet. MB
-    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
-    wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxPoint(10, 10));
+#if !defined(__WXMOTIF__) && !defined(__WIN16__)  // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
+    wxIcon icon = wxArtProvider::GetIcon(wxART_INFORMATION);
+    (void) new wxStaticBitmap( panel, -1, icon, wxPoint(10, 10) );
 
-    bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
-    bmpStatic->SetIcon(wxTheApp->GetStdIcon(wxICON_QUESTION));
+    // VZ: don't leak memory
+    // bmpStatic = new wxStaticBitmap(panel, -1, wxNullIcon, wxPoint(50, 10));
+    // bmpStatic->SetIcon(wxArtProvider::GetIcon(wxART_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", 20, 20);
+    dc.DrawText(_T("Bitmap"), 30, 40);
     dc.SelectObject( wxNullBitmap );
 
+    (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
+
+#if defined(__WXMSW__) || defined(__WXMOTIF__)
+    // test for masked bitmap display
+    bitmap = wxBitmap(_T("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
+
+    wxBitmap bmp1(wxArtProvider::GetBitmap(wxART_INFORMATION)),
+             bmp2(wxArtProvider::GetBitmap(wxART_WARNING)),
+             bmp3(wxArtProvider::GetBitmap(wxART_QUESTION));
     wxBitmapButton *bmpBtn = new wxBitmapButton
                                  (
-                                  panel,
-                                  -1,
-                                  bitmap,
-                                  wxPoint(100, 20)
+                                  panel, -1,
+                                  bmp1,
+                                  wxPoint(30, 70)
                                  );
-    bmpBtn = NULL; // suppress warning
 
-    new wxButton(panel, -1, "Another button", wxPoint(250, 20));
+    bmpBtn->SetBitmapSelected(bmp2);
+    bmpBtn->SetBitmapFocus(bmp3);
+
+#if wxUSE_TOGGLEBTN
+    (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
+                             _T("&Toggle label"), wxPoint(250, 20));
+#else
+    (void)new wxCheckBox(panel, ID_BUTTON_LABEL,
+                         _T("&Toggle label"), wxPoint(250, 20));
+#endif // wxUSE_TOGGLEBTN
+
+    m_label = new wxStaticText(panel, -1, _T("Label with some long text"),
+                               wxPoint(250, 60), wxDefaultSize,
+                               wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
+    m_label->SetForegroundColour( *wxBLUE );
+
+    m_notebook->AddPage(panel, _T("wxBitmapXXX"));
+
+    // layout constraints
+#if wxUSE_CONSTRAINTS
+    wxLayoutConstraints *c;
+
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );
+
+    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_notebook->AddPage(panel, "wxBitmapXXX");
+    wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, _T("Test Button &1") );
+    pMyButton->SetConstraints( c );
+
+    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, _T("Test Button &2") );
+    pMyButton2->SetConstraints( c );
+
+    m_notebook->AddPage(panel, _T("wxLayoutConstraint"));
+#endif
+    
+    // sizer
+
+    panel = new wxPanel(m_notebook);
+    panel->SetAutoLayout( TRUE );
+
+    wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer *csizer =
+      new wxStaticBoxSizer (new wxStaticBox (panel, -1, _T("Show Buttons")),
+                           wxHORIZONTAL );
+    
+    wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
+    check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
+    check1->SetValue (TRUE);
+    csizer->Add (check1);
+    check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, _T("2"));
+    check2->SetValue (TRUE);
+    csizer->Add (check2);
+    check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, _T("3"));
+    check3->SetValue (TRUE);
+    csizer->Add (check3);
+    check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, _T("4"));
+    check4->SetValue (TRUE);
+    csizer->Add (check4);
+    check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, _T("1-4"));
+    check14->SetValue (TRUE);
+    csizer->Add (check14);
+    checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
+    checkBig->SetValue (TRUE);
+    csizer->Add (checkBig);
+    
+    sizer->Add (csizer);
+
+    m_hsizer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonSizer = new wxBoxSizer (wxVERTICAL);
+    
+    m_sizerBtn1 = new wxButton(panel, -1, _T("Test Button &1") );
+    m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );
+    m_sizerBtn2 = new wxButton(panel, -1, _T("Test Button &2") );
+    m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );
+    m_sizerBtn3 = new wxButton(panel, -1, _T("Test Button &3") );
+    m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );
+    m_sizerBtn4 = new wxButton(panel, -1, _T("Test Button &4") );
+    m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );
+
+    m_hsizer->Add (m_buttonSizer);
+    m_hsizer->Add( 20,20, 1 );
+    m_bigBtn = new wxButton(panel, -1, _T("Multiline\nbutton") );
+    m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 );
+
+    sizer->Add (m_hsizer, 1, wxGROW);
+
+    panel->SetSizer( sizer );
+
+    m_notebook->AddPage(panel, _T("wxSizer"));
 }
 
 void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
@@ -547,11 +956,11 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
     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) != wxYES )
+        if ( wxMessageBox(_T("This demonstrates how a program may prevent the\n")
+                          _T("page change from taking place - if you select\n")
+                          _T("[No] the current page will stay the third one\n"),
+                          _T("Control sample"),
+                          wxICON_QUESTION | wxYES_NO, this) != wxYES )
         {
             event.Veto();
 
@@ -559,29 +968,98 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
         }
     }
 
-    *m_text << "Notebook selection is being changed from " << selOld << "\n";
+    *m_text << _T("Notebook selection is being changed from ") << selOld
+            << _T(" to ") << event.GetSelection()
+            << _T(" (current page from notebook is ")
+            << m_notebook->GetSelection() << _T(")\n");
 }
 
 void MyPanel::OnPageChanged( wxNotebookEvent &event )
 {
-    *m_text << "Notebook selection is " << event.GetSelection() << "\n";
+    *m_text << _T("Notebook selection is now ") << event.GetSelection()
+            << _T(" (from notebook: ") << m_notebook->GetSelection()
+            << _T(")\n");
+}
+
+void MyPanel::OnTestButton(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Button %c clicked."),
+                 event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
+}
+
+void MyPanel::OnBmpButton(wxCommandEvent& WXUNUSED(event))
+{
+    wxLogMessage(_T("Bitmap button clicked."));
+}
+
+void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
+{
+    static wxColour s_colOld;
+
+    // test panel colour changing and propagation to the subcontrols
+    if ( s_colOld.Ok() )
+    {
+        SetBackgroundColour(s_colOld);
+        s_colOld = wxNullColour;
+
+        m_lbSelectThis->SetForegroundColour(wxT("red"));
+        m_lbSelectThis->SetBackgroundColour(wxT("white"));
+    }
+    else
+    {
+        s_colOld = wxColour(wxT("red"));
+        SetBackgroundColour(wxT("white"));
+
+        m_lbSelectThis->SetForegroundColour(wxT("white"));
+        m_lbSelectThis->SetBackgroundColour(wxT("red"));
+    }
+
+    m_lbSelectThis->Refresh();
+    Refresh();
 }
 
 void MyPanel::OnListBox( wxCommandEvent &event )
 {
-    m_text->AppendText( "ListBox event selection string is: " );
+//    GetParent()->Move(100, 100);
+
+    if (event.GetInt() == -1)
+    {
+        m_text->AppendText( _T("ListBox has no selections anymore\n") );
+        return;
+    }
+
+    wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
+                                                     : m_listboxSorted;
+
+    m_text->AppendText( _T("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" );
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("ListBox control selection string is: '") );
+    m_text->AppendText( listbox->GetStringSelection() );
+    m_text->AppendText( _T("'\n") );
+
+    wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
+    m_text->AppendText( _T("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(_T("none")) );
+
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("ListBox control client data string is: '") );
+    obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
+    if (obj)
+        m_text->AppendText( obj->GetData() );
+    else
+        m_text->AppendText( wxString(_T("none")) );
+    m_text->AppendText( _T("'\n") );
 }
 
 void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
 {
-    m_text->AppendText( "ListBox double click string is: " );
+    m_text->AppendText( _T("ListBox double click string is: ") );
     m_text->AppendText( event.GetString() );
-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );
 }
 
 void MyPanel::OnListBoxButtons( wxCommandEvent &event )
@@ -590,62 +1068,102 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
     {
         case ID_LISTBOX_ENABLE:
             {
-                m_text->AppendText("Checkbox clicked.\n");
-                wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
+                m_text->AppendText(_T("Checkbox clicked.\n"));
 #if wxUSE_TOOLTIPS
+                wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
                 if (event.GetInt())
-                    cb->SetToolTip( "Click to enable listbox" );
+                    cb->SetToolTip( _T("Click to enable listbox") );
                 else
-                    cb->SetToolTip( "Click to disable listbox" );
+                    cb->SetToolTip( _T("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 );
+                if (m_listbox->GetCount() > 2)
+                    m_listbox->SetSelection( 2 );
+                if (m_listboxSorted->GetCount() > 2)
+                    m_listboxSorted->SetSelection( 2 );
                 m_lbSelectThis->WarpPointer( 40, 14 );
                 break;
             }
         case ID_LISTBOX_SEL_STR:
             {
-                m_listbox->SetStringSelection( "This" );
+                if (m_listbox->FindString(_T("This")) > -1)
+                    m_listbox->SetStringSelection( _T("This") );
+                if (m_listboxSorted->FindString(_T("This")) > -1)
+                    m_listboxSorted->SetStringSelection( _T("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_listbox->Append( _T("Hi!") );
+                m_listboxSorted->Append( _T("Hi!") );
                 break;
             }
         case ID_LISTBOX_DELETE:
             {
-                int idx = m_listbox->GetSelection();
-                m_listbox->Delete( idx );
+                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 )
 {
-    m_text->AppendText( "Choice event selection string is: " );
+    wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
+                                                  : m_choiceSorted;
+
+    m_text->AppendText( _T("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" );
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("Choice control selection string is: '") );
+    m_text->AppendText( choice->GetStringSelection() );
+    m_text->AppendText( _T("'\n") );
+
+    wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
+    m_text->AppendText( _T("Choice event client data string is: '") );
+
+    if (obj)
+       m_text->AppendText( obj->GetData() );
+    else
+       m_text->AppendText( wxString(_T("none")) );
+
+    m_text->AppendText( _T("'\n") );
+    m_text->AppendText( _T("Choice control client data string is: '") );
+    obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
+
+    if (obj)
+       m_text->AppendText( obj->GetData() );
+    else
+       m_text->AppendText( wxString(_T("none")) );
+    m_text->AppendText( _T("'\n") );
 }
 
 void MyPanel::OnChoiceButtons( wxCommandEvent &event )
@@ -655,50 +1173,75 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
         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_choice->SetStringSelection( _T("This") );
+                m_choiceSorted->SetStringSelection( _T("This") );
                 break;
             }
         case ID_CHOICE_CLEAR:
             {
                 m_choice->Clear();
+                m_choiceSorted->Clear();
                 break;
             }
         case ID_CHOICE_APPEND:
             {
-                m_choice->Append( "Hi!" );
+                m_choice->Append( _T("Hi!") );
+                m_choiceSorted->Append( _T("Hi!") );
                 break;
             }
         case ID_CHOICE_DELETE:
             {
                 int idx = m_choice->GetSelection();
-                m_choice->Delete( idx );
+                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 )
 {
-    m_text->AppendText( "ComboBox event selection string is: " );
+    m_text->AppendText( _T("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( _T("\n") );
+    m_text->AppendText( _T("ComboBox control selection string is: ") );
     m_text->AppendText( m_combo->GetStringSelection() );
-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );
+}
+
+void MyPanel::OnComboTextChanged(wxCommandEvent& event)
+{
+    wxString str;
+    str.Printf( wxT("Text in the combobox changed: now is '%s'."),
+                event.GetString().c_str() );
+    wxLogMessage( str.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 )
@@ -717,7 +1260,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
             }
         case ID_COMBO_SEL_STR:
             {
-                m_combo->SetStringSelection( "This" );
+                m_combo->SetStringSelection( _T("This") );
                 break;
             }
         case ID_COMBO_CLEAR:
@@ -727,7 +1270,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
             }
         case ID_COMBO_APPEND:
             {
-                m_combo->Append( "Hi!" );
+                m_combo->Append( _T("Hi!") );
                 break;
             }
         case ID_COMBO_DELETE:
@@ -746,9 +1289,19 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
 
 void MyPanel::OnRadio( wxCommandEvent &event )
 {
-    m_text->AppendText( "RadioBox selection string is: " );
+    m_text->AppendText( _T("RadioBox selection string is: ") );
     m_text->AppendText( event.GetString() );
-    m_text->AppendText( "\n" );
+    m_text->AppendText( _T("\n") );
+}
+
+void MyPanel::OnRadioButton1( wxCommandEvent & WXUNUSED(event) )
+{
+    wxMessageBox(_T("First wxRadioButton selected."), _T("wxControl sample"));
+}
+
+void MyPanel::OnRadioButton2( wxCommandEvent & WXUNUSED(event) )
+{
+    m_text->AppendText(_T("Second wxRadioButton selected.\n"));
 }
 
 void MyPanel::OnRadioButtons( wxCommandEvent &event )
@@ -767,11 +1320,13 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
             }
         case ID_RADIOBOX_SEL_STR:
             {
-                m_radio->SetStringSelection( "This" );
+                m_radio->SetStringSelection( _T("This") );
                 break;
             }
         case ID_RADIOBOX_FONT:
             {
+                    m_radio->SetForegroundColour(*wxGREEN);
+
                 m_radio->SetFont( *wxITALIC_FONT );
                 break;
             }
@@ -784,19 +1339,72 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
     m_text->SetFont( *wxITALIC_FONT );
 }
 
+void MyPanel::OnUpdateLabel( wxCommandEvent &event )
+{
+    m_label->SetLabel(event.GetInt() ? _T("Very very very very very long text.")
+                                     : _T("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::OnSpinCtrlText(wxCommandEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        wxString s;
+        s.Printf( _T("Spin ctrl text changed: now %d (from event: %s)\n"),
+                 m_spinctrl->GetValue(), event.GetString().c_str() );
+        m_text->AppendText(s);
+    }
+}
+
+void MyPanel::OnSpinCtrl(wxSpinEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        wxString s;
+        s.Printf( _T("Spin ctrl changed: now %d (from event: %ld)\n"),
+                 m_spinctrl->GetValue(), event.GetInt() );
+        m_text->AppendText(s);
+    }
+}
+
+void MyPanel::OnSpinCtrlUp(wxSpinEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        m_text->AppendText( wxString::Format(
+            _T("Spin up: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
+    }
+}
+
+void MyPanel::OnSpinCtrlDown(wxSpinEvent& event)
+{
+    if ( m_spinctrl )
+    {
+        m_text->AppendText( wxString::Format(
+            _T("Spin down: %d (from event: %ld)\n"),
+            m_spinctrl->GetValue(), event.GetInt() ) );
+    }
 }
 
-#if wxUSE_SPINBUTTON
+#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 )
+    if ( event.GetPosition() > 17 )
     {
         value += _T("Preventing the spin button from going above 17.\n");
 
@@ -812,7 +1420,7 @@ void MyPanel::OnSpinDown( wxSpinEvent &event )
     value.Printf( _T("Spin control down: current = %d\n"),
                  m_spinbutton->GetValue());
 
-    if ( m_spinbutton->GetValue() < -17 )
+    if ( event.GetPosition() < -17 )
     {
         value += _T("Preventing the spin button from going below -17.\n");
 
@@ -843,11 +1451,19 @@ void MyPanel::OnUpdateShowProgress( wxUpdateUIEvent& event )
 void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 {
     int max = m_spinbutton->GetValue();
-    wxProgressDialog dialog("Progress dialog example",
-                            "An informative message",
+    
+    if ( max <= 0 )
+    {
+        wxLogError(_T("You must set positive range!"));
+        return;
+    }
+    
+    wxProgressDialog dialog(_T("Progress dialog example"),
+                            _T("An informative message"),
                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |
+                            wxPD_AUTO_HIDE |
                             wxPD_APP_MODAL |
                             wxPD_ELAPSED_TIME |
                             wxPD_ESTIMATED_TIME |
@@ -855,16 +1471,16 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 
 
     bool cont = TRUE;
-    for ( int i = 0; i < max && cont; i++ )
+    for ( int i = 0; i <= max && cont; i++ )
     {
         wxSleep(1);
-        if ( i == max - 1 )
+        if ( i == max )
         {
-            cont = dialog.Update(i, "That's all, folks!");
+            cont = dialog.Update(i, _T("That's all, folks!"));
         }
         else if ( i == max / 2 )
         {
-            cont = dialog.Update(i, "Only a half left!");
+            cont = dialog.Update(i, _T("Only a half left (very long message)!"));
         }
         else
         {
@@ -874,18 +1490,52 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 
     if ( !cont )
     {
-        *m_text << "Progress dialog aborted!\n";
+        *m_text << _T("Progress dialog aborted!\n");
     }
     else
     {
-        *m_text << "Countdown from " << max << " finished.\n";
+        *m_text << _T("Countdown from ") << max << _T(" finished.\n");
     }
 }
 
-#endif // wxUSE_SPINBUTTON
+#endif // wxUSE_SPINBTN
+
+void MyPanel::OnSizerCheck( wxCommandEvent &event)
+{
+  switch (event.GetId ()) {
+  case ID_SIZER_CHECK1:
+    m_buttonSizer->Show (m_sizerBtn1, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK2:
+    m_buttonSizer->Show (m_sizerBtn2, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK3:
+    m_buttonSizer->Show (m_sizerBtn3, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK4:
+    m_buttonSizer->Show (m_sizerBtn4, event.IsChecked ());
+    m_buttonSizer->Layout ();
+    break;
+  case ID_SIZER_CHECK14:
+    m_hsizer->Show (m_buttonSizer, event.IsChecked ());
+    m_hsizer->Layout ();
+    break;
+  case ID_SIZER_CHECKBIG:
+    m_hsizer->Show (m_bigBtn, event.IsChecked ());
+    m_hsizer->Layout ();
+    break;
+  }
+
+}
 
 MyPanel::~MyPanel()
 {
+    //wxLog::RemoveTraceMask(_T("focus"));
+    delete wxLog::SetActiveTarget(m_logTargetOld);
+
     delete m_notebook->GetImageList();
 }
 
@@ -894,22 +1544,64 @@ MyPanel::~MyPanel()
 //----------------------------------------------------------------------
 
 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(MINIMAL_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
-EVT_MENU(MINIMAL_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)
+    EVT_MENU(CONTROLS_SET_TOOLTIP_DELAY,  MyFrame::OnSetTooltipDelay)
+    EVT_MENU(CONTROLS_ENABLE_TOOLTIPS,  MyFrame::OnToggleTooltips)
 #endif // wxUSE_TOOLTIPS
-EVT_SIZE(MyFrame::OnSize)
-EVT_IDLE(MyFrame::OnIdle)
+
+    EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)
+
+    EVT_SIZE(MyFrame::OnSize)
+    EVT_MOVE(MyFrame::OnMove)
+
+    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 wxChar *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, _T("&Clear log\tCtrl-L"));
+    file_menu->AppendSeparator();
+    file_menu->Append(CONTROLS_ABOUT, _T("&About\tF1"));
+    file_menu->AppendSeparator();
+    file_menu->Append(CONTROLS_QUIT, _T("E&xit\tAlt-X"), _T("Quit controls sample"));
+
+    wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, _T("&File"));
+
+#if wxUSE_TOOLTIPS
+    wxMenu *tooltip_menu = new wxMenu;
+    tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, _T("Set &delay\tCtrl-D"));
+    tooltip_menu->AppendSeparator();
+    tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
+            _T("enable/disable tooltips"), TRUE);
+    tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);
+    menu_bar->Append(tooltip_menu, _T("&Tooltips"));
+#endif // wxUSE_TOOLTIPS
+
+    wxMenu *panel_menu = new wxMenu;
+    panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
+                       _T("Enable/disable all panel controls"), TRUE);
+    menu_bar->Append(panel_menu, _T("&Panel"));
+
+    SetMenuBar(menu_bar);
+
     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) )
@@ -919,24 +1611,27 @@ void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
-    wxBeginBusyCursor();
+    wxBusyCursor bc;
 
-    wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
+    wxMessageDialog dialog(this, _T("This is a control sample"), _T("About Controls"), wxOK );
     dialog.ShowModal();
+}
 
-    wxEndBusyCursor();
+void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->m_text->Clear();
 }
 
 #if wxUSE_TOOLTIPS
-void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
+void MyFrame::OnSetTooltipDelay(wxCommandEvent& WXUNUSED(event))
 {
     static long s_delay = 5000;
 
     wxString delay;
     delay.Printf( _T("%ld"), s_delay);
 
-    delay = wxGetTextFromUser("Enter delay (in milliseconds)",
-            "Set tooltip delay",
+    delay = wxGetTextFromUser(_T("Enter delay (in milliseconds)"),
+            _T("Set tooltip delay"),
             delay,
             this);
     if ( !delay )
@@ -949,7 +1644,7 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
     wxLogStatus(this, _T("Tooltip delay set to %ld milliseconds"), s_delay);
 }
 
-void MyFrame::OnToggleTooltips(wxCommandEvent& event)
+void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))
 {
     static bool s_enabled = TRUE;
 
@@ -961,11 +1656,24 @@ void MyFrame::OnToggleTooltips(wxCommandEvent& event)
 }
 #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 )
 {
-    wxString msg;
-    msg.Printf( _("%dx%d"), event.GetSize().x, event.GetSize().y);
-    SetStatusText(msg, 1);
+    UpdateStatusBar(GetPosition(), event.GetSize());
 
     event.Skip();
 }
@@ -982,16 +1690,73 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__
-                _T("Focus: wxWindow = %p, HWND = %08x"),
+                _T("Focus: %s, HWND = %08x"),
 #else
-                _T("Focus: wxWindow = %p"),
+                _T("Focus: %s"),
 #endif
-                s_windowFocus
+                s_windowFocus->GetClassInfo()->GetClassName()
 #ifdef __WXMSW__
-                , s_windowFocus->GetHWND()
+                , (unsigned int) s_windowFocus->GetHWND()
 #endif
                   );
 
         SetStatusText(msg);
     }
 }
+
+void MyComboBox::OnChar(wxKeyEvent& event)
+{
+    wxLogMessage(_T("MyComboBox::OnChar"));
+
+    if ( event.GetKeyCode() == 'w' )
+        wxLogMessage(_T("MyComboBox: 'w' will be ignored."));
+    else
+        event.Skip();
+}
+
+void MyComboBox::OnKeyDown(wxKeyEvent& event)
+{
+    wxLogMessage(_T("MyComboBox::OnKeyDown"));
+
+    if ( event.GetKeyCode() == '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));
+    }
+}
+
+#if wxUSE_CHOICE
+
+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));
+    }
+}
+
+#endif // wxUSE_CHOICE