fix for bug in wxEditableListBox in connection with new wxListCtrl

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index ac536f9b9c9abbd910e83560dd95854bbd3b81c0..4c23313cd19e14aa2ab7158793f6348e42487b5d 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -26,6 +26,7 @@
 #if !defined( __WXMSW__ ) || defined( __WIN95__ )
 #include "wx/spinbutt.h"
 #endif
 #if !defined( __WXMSW__ ) || defined( __WIN95__ )
 #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"
 


@@ -33,7 +34,7 @@
     #include "wx/tooltip.h"
 #endif
 
     #include "wx/tooltip.h"
 #endif
 

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

     #define USE_XPM
 #endif
 
     #define USE_XPM
 #endif
 


@@ -88,6 +89,8 @@ public:
     void OnChoice( wxCommandEvent &event );
     void OnChoiceButtons( wxCommandEvent &event );
     void OnCombo( wxCommandEvent &event );
     void OnChoice( wxCommandEvent &event );
     void OnChoiceButtons( 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 OnComboButtons( wxCommandEvent &event );
     void OnRadio( wxCommandEvent &event );
     void OnRadioButtons( wxCommandEvent &event );


@@ -105,11 +108,13 @@ public:
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL
 #endif // wxUSE_SPINBTN
 
 #if wxUSE_SPINCTRL

-    void OnSpinCtrl(wxCommandEvent& event);
+    void OnSpinCtrl(wxSpinEvent& event);

 #endif // wxUSE_SPINCTRL
 
     void OnEnableAll(wxCommandEvent& event);
     void OnChangeColour(wxCommandEvent& 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;
 
     wxListBox     *m_listbox,
                   *m_listboxSorted;


@@ -117,7 +122,8 @@ public:
                   *m_choiceSorted;
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;
                   *m_choiceSorted;
     wxComboBox    *m_combo;
     wxRadioBox    *m_radio;

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

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


@@ -140,6 +146,8 @@ public:
     wxStaticText  *m_label;
 
 private:
     wxStaticText  *m_label;
 
 private:

+    wxLog *m_logTargetOld;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -150,6 +158,7 @@ public:
 
     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);
 
 #if wxUSE_TOOLTIPS
     void OnSetTooltipDelay(wxCommandEvent& event);


@@ -168,8 +177,11 @@ private:
     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {
         wxString msg;
     void UpdateStatusBar(const wxPoint& pos, const wxSize& size)
     {
         wxString msg;

-        msg.Printf(_("pos=(%d, %d), size=%dx%d"),
-                   pos.x, pos.y, size.x, size.y);
+        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);
     }
 
         SetStatusText(msg, 1);
     }
 


@@ -178,11 +190,101 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     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) { }
+
+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()
+};
+

 //----------------------------------------------------------------------
 // other
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 // other
 //----------------------------------------------------------------------
 

-static void SetControlClientData(const char *name,
+static void SetControlClientData(const wxChar *name,

                                  wxControlWithItems *control);
 
 IMPLEMENT_APP(MyApp)
                                  wxControlWithItems *control);
 
 IMPLEMENT_APP(MyApp)


@@ -193,16 +295,17 @@ IMPLEMENT_APP(MyApp)
 
 enum
 {
 
 enum
 {

-    MINIMAL_QUIT   = 100,
-    MINIMAL_TEXT,
-    MINIMAL_ABOUT,
+    CONTROLS_QUIT   = 100,
+    CONTROLS_TEXT,
+    CONTROLS_ABOUT,
+    CONTROLS_CLEAR_LOG,

 
     // tooltip menu
 
     // tooltip menu

-    MINIMAL_SET_TOOLTIP_DELAY = 200,
-    MINIMAL_ENABLE_TOOLTIPS,
+    CONTROLS_SET_TOOLTIP_DELAY = 200,
+    CONTROLS_ENABLE_TOOLTIPS,

 
     // panel menu
 
     // panel menu

-    MINIMAL_ENABLE_ALL
+    CONTROLS_ENABLE_ALL

 };
 
 bool MyApp::OnInit()
 };
 
 bool MyApp::OnInit()


@@ -210,17 +313,17 @@ bool MyApp::OnInit()
     // parse the cmd line
     int x = 50,
         y = 50;
     // parse the cmd line
     int x = 50,
         y = 50;

-    if ( argc == 2 )
+    if ( argc == 3 )

     {
     {

-        wxSscanf(argv[1], "%d", &x);
-        wxSscanf(argv[2], "%d", &y);
+        //wxSscanf(argv[1], "%d", &x);
+        //wxSscanf(argv[2], "%d", &y);

     }
 
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
             x, y, 540, 430);
     }
 
     // Create the main frame window
     MyFrame *frame = new MyFrame((wxFrame *) NULL,
             "Controls wxWindows App",
             x, y, 540, 430);

-    
+

     frame->SetSizeHints( 500, 425 );
 
     // Give it an icon
     frame->SetSizeHints( 500, 425 );
 
     // Give it an icon


@@ -231,34 +334,35 @@ bool MyApp::OnInit()
 
     wxMenu *file_menu = new wxMenu("",  wxMENU_TEAROFF);
 
 
     wxMenu *file_menu = new wxMenu("",  wxMENU_TEAROFF);
 

-    file_menu->Append(MINIMAL_ABOUT, "&About\tF1");
+    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->AppendSeparator();

-    file_menu->Append(MINIMAL_QUIT, "E&xit\tAlt-X", "Quit controls sample");
+    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;
 
     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->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D");

     tooltip_menu->AppendSeparator();
     tooltip_menu->AppendSeparator();

-    tooltip_menu->Append(MINIMAL_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",
+    tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T",

             "enable/disable tooltips", TRUE);
             "enable/disable tooltips", TRUE);

-    tooltip_menu->Check(MINIMAL_ENABLE_TOOLTIPS, TRUE);
+    tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);

     menu_bar->Append(tooltip_menu, "&Tooltips");
 #endif // wxUSE_TOOLTIPS
 
     wxMenu *panel_menu = new wxMenu;
     menu_bar->Append(tooltip_menu, "&Tooltips");
 #endif // wxUSE_TOOLTIPS
 
     wxMenu *panel_menu = new wxMenu;

-    panel_menu->Append(MINIMAL_ENABLE_ALL, "&Disable all\tCtrl-E",
+    panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E",

                        "Enable/disable all panel controls", TRUE);
     menu_bar->Append(panel_menu, "&Panel");
 
     frame->SetMenuBar(menu_bar);
 
     frame->Show(TRUE);
                        "Enable/disable all panel controls", TRUE);
     menu_bar->Append(panel_menu, "&Panel");
 
     frame->SetMenuBar(menu_bar);
 
     frame->Show(TRUE);

-    frame->SetCursor(wxCursor(wxCURSOR_HAND));

 
 

-    frame->GetPanel()->m_notebook->SetSelection(6);
+    //frame->GetPanel()->m_notebook->SetSelection(6);

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 


@@ -319,6 +423,10 @@ const int  ID_BTNPROGRESS       = 183;
 const int  ID_BUTTON_LABEL      = 184;
 const int  ID_SPINCTRL          = 185;
 
 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)
 const int  ID_CHANGE_COLOUR     = 200;
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)


@@ -345,6 +453,8 @@ 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_CHOICE_FONT,          MyPanel::OnChoiceButtons)
 EVT_CHECKBOX  (ID_CHOICE_ENABLE,        MyPanel::OnChoiceButtons)
 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_SEL_NUM,        MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_SEL_STR,        MyPanel::OnComboButtons)
 EVT_BUTTON    (ID_COMBO_CLEAR,          MyPanel::OnComboButtons)


@@ -369,22 +479,51 @@ EVT_BUTTON    (ID_BTNPROGRESS,          MyPanel::OnShowProgress)
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
 #endif // wxUSE_SPINCTRL
 #if wxUSE_SPINCTRL
 EVT_SPINCTRL  (ID_SPINCTRL,             MyPanel::OnSpinCtrl)
 #endif // wxUSE_SPINCTRL

-EVT_BUTTON    (ID_BUTTON_LABEL,         MyPanel::OnUpdateLabel)
+#if wxUSE_TOGGLEBTN
+EVT_TOGGLEBUTTON(ID_BUTTON_LABEL,       MyPanel::OnUpdateLabel)
+#endif // wxUSE_TOGGLEBTN

 EVT_CHECKBOX  (ID_CHANGE_COLOUR,        MyPanel::OnChangeColour)
 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()
 
 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)
 {
     wxLayoutConstraints *c;
 
 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)
 {
     wxLayoutConstraints *c;
 

-    m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
-    //  m_text->SetBackgroundColour("wheat");
+    m_text = new wxTextCtrl(this, -1, "This is the log window.\n",
+                            wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
+    m_text->SetBackgroundColour("wheat");

 
 

-    //delete wxLog::SetActiveTarget(new wxLogStderr);
+    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[] =
     {
 
     wxString choices[] =
     {


@@ -430,7 +569,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) )
         {
         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);
         }
     }
                     s_iconNames[n], n);
         }
     }


@@ -457,20 +596,20 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                                      wxPoint(10,90), wxSize(120,70),
                                      5, choices, wxLB_SORT );
 
                                      wxPoint(10,90), wxSize(120,70),
                                      5, choices, wxLB_SORT );
 

-    SetControlClientData("listbox", m_listbox);
-    SetControlClientData("listbox", m_listboxSorted);
+    SetControlClientData(wxT("listbox"), m_listbox);
+    SetControlClientData(wxT("listbox"), m_listboxSorted);

 
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 #if wxUSE_TOOLTIPS
     m_listbox->SetToolTip( "This is a list box" );
 #endif // wxUSE_TOOLTIPS
 
 
     m_listbox->SetCursor(*wxCROSS_CURSOR);
 #if wxUSE_TOOLTIPS
     m_listbox->SetToolTip( "This is a list box" );
 #endif // wxUSE_TOOLTIPS
 

-    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) );
-    wxButton *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, "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->SetDefault();
 


@@ -487,6 +626,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 #endif // wxUSE_TOOLTIPS
     (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour",
                           wxPoint(110,170) );
 #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);
 
     panel = new wxPanel(m_notebook);
     m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List);
 
     panel = new wxPanel(m_notebook);


@@ -494,34 +634,36 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
                                    5, choices, wxCB_SORT );
 
     m_choiceSorted = new wxChoice( panel, ID_CHOICE_SORTED, wxPoint(10,70), wxSize(120,-1),
                                    5, choices, wxCB_SORT );
 

-#ifndef __WXMOTIF__
-    SetControlClientData("choice", m_choice);
-    SetControlClientData("choice", m_choiceSorted);
-#endif
+    SetControlClientData(wxT("choice"), m_choice);
+    SetControlClientData(wxT("choice"), m_choiceSorted);

 
     m_choice->SetSelection(2);
     m_choice->SetBackgroundColour( "red" );
 
     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) );
+    (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);
 
     panel = new wxPanel(m_notebook);
 
     m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice);
 
     panel = new wxPanel(m_notebook);

-    (void)new wxStaticBox( panel, -1, "Box around combobox",
+    (void)new wxStaticBox( panel, -1, "&Box around combobox",

                            wxPoint(5, 5), wxSize(150, 100));
                            wxPoint(5, 5), wxSize(150, 100));

-    m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,25), 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_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[] =
     m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo);
 
     wxString choices2[] =


@@ -533,33 +675,41 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     };
 
     panel = new wxPanel(m_notebook);
     };
 
     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 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
 
 #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
 
     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 );
+    (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 );
     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 );
+    (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);
     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(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, "&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__
     // No wrapping text in wxStaticText yet :-(
     (void)new wxStaticText( panel, -1,
                             "Drag the slider!",
 #ifdef __WXMOTIF__
     // No wrapping text in wxStaticText yet :-(
     (void)new wxStaticText( panel, -1,
                             "Drag the slider!",

-                            wxPoint(228,30),
+                            wxPoint(250,30),

                             wxSize(240, -1)
                           );
 #else
                             wxSize(240, -1)
                           );
 #else


@@ -570,7 +720,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                             "\n"
                             "This is also supposed to demonstrate how\n"
                             "to use static controls.\n",
                             "\n"
                             "This is also supposed to demonstrate how\n"
                             "to use static controls.\n",

-                            wxPoint(228,25),
+                            wxPoint(250,25),

                             wxSize(240, 110)
                           );
 #endif
                             wxSize(240, 110)
                           );
 #endif


@@ -583,7 +733,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     m_spinbutton->SetRange(-10,30);
     m_spinbutton->SetValue(initialSpinValue);
 
     m_spinbutton->SetRange(-10,30);
     m_spinbutton->SetValue(initialSpinValue);
 

-    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "Show progress dialog",
+    m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog",

                                   wxPoint(300, 160) );
 #endif // wxUSE_SPINBTN
 
                                   wxPoint(300, 160) );
 #endif // wxUSE_SPINBTN
 


@@ -597,7 +747,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     panel = new wxPanel(m_notebook);
 
 
     panel = new wxPanel(m_notebook);
 

-#ifndef __WXMOTIF__  // wxStaticBitmap not working under Motif yet. MB
+#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));
     wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
     wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
                                                    wxPoint(10, 10));


@@ -615,13 +765,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     dc.DrawText("Bitmap", 30, 40);
     dc.SelectObject( wxNullBitmap );
 
     dc.DrawText("Bitmap", 30, 40);
     dc.SelectObject( wxNullBitmap );
 

-    (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
+    (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));

 
 

-#if 0
-    bitmap = wxBitmap("../../utils/wxPython/tests/bitmaps/test2.bmp",
-                      wxBITMAP_TYPE_BMP);
-    bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
-    (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(300, 120));
+#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
 
     wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
 #endif
 
     wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),


@@ -631,15 +785,20 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
                                  (
                                   panel, -1,
                                   bmp1,
                                  (
                                   panel, -1,
                                   bmp1,

-                                  wxPoint(30, 50)
+                                  wxPoint(30, 70)

                                  );
     bmpBtn->SetBitmapSelected(bmp2);
     bmpBtn->SetBitmapFocus(bmp3);
 
                                  );
     bmpBtn->SetBitmapSelected(bmp2);
     bmpBtn->SetBitmapFocus(bmp3);
 

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

     m_label = new wxStaticText(panel, -1, "Label with some long text",
                                wxPoint(250, 60), wxDefaultSize,
     m_label = new wxStaticText(panel, -1, "Label with some long text",
                                wxPoint(250, 60), wxDefaultSize,

-                               wxALIGN_RIGHT | wxST_NO_AUTORESIZE);
+                               wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
+    m_label->SetForegroundColour( *wxBLUE );

 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 
 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 


@@ -654,7 +813,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     c->left.SameAs( panel, wxLeft, 10 );
     c->width.PercentOf( panel, wxWidth, 40 );
 
     c->left.SameAs( panel, wxLeft, 10 );
     c->width.PercentOf( panel, wxWidth, 40 );
 

-    wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
+    wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" );

     pMyButton->SetConstraints( c );
 
     c = new wxLayoutConstraints;
     pMyButton->SetConstraints( c );
 
     c = new wxLayoutConstraints;


@@ -663,7 +822,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     c->right.SameAs( panel, wxRight, 10 );
     c->width.PercentOf( panel, wxWidth, 40 );
 
     c->right.SameAs( panel, wxRight, 10 );
     c->width.PercentOf( panel, wxWidth, 40 );
 

-    wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
+    wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" );

     pMyButton2->SetConstraints( c );
 
     m_notebook->AddPage(panel, "wxLayoutConstraint");
     pMyButton2->SetConstraints( c );
 
     m_notebook->AddPage(panel, "wxLayoutConstraint");


@@ -675,9 +834,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
 
 
     wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
 

-    sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
+    sizer->Add( new wxButton(panel, -1, "Test Button &1" ), 3, wxALL, 10 );

     sizer->Add( 20,20, 1 );
     sizer->Add( 20,20, 1 );

-    sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
+    sizer->Add( new wxButton(panel, -1, "Test Button &2" ), 3, wxGROW|wxALL, 10 );

 
     panel->SetSizer( sizer );
 
 
     panel->SetSizer( sizer );
 


@@ -703,7 +862,7 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
                           "page change from taking place - if you select\n"
                           "[No] the current page will stay the third one\n",
                           "Control sample",
                           "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 )
+                          wxICON_QUESTION | wxYES_NO, this) != wxYES )

         {
             event.Veto();
 
         {
             event.Veto();
 


@@ -711,12 +870,27 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
         }
     }
 
         }
     }
 

-    *m_text << "Notebook selection is being changed from " << selOld << "\n";
+    *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::OnTestButton(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Button %c clicked."),
+                 event.GetId() == ID_BUTTON_TEST1 ? _T('1') : _T('2'));
+}
+
+void MyPanel::OnBmpButton(wxCommandEvent& event)
+{
+    wxLogMessage(_T("Bitmap button clicked."));

 }
 
 void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))


@@ -729,13 +903,13 @@ void MyPanel::OnChangeColour(wxCommandEvent& WXUNUSED(event))
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 
         SetBackgroundColour(s_colOld);
         s_colOld = wxNullColour;
 

-        m_lbSelectThis->SetForegroundColour("yellow");
-        m_lbSelectThis->SetBackgroundColour("blue");
+        m_lbSelectThis->SetForegroundColour("red");
+        m_lbSelectThis->SetBackgroundColour("white");

     }
     else
     {
     }
     else
     {

-        s_colOld = GetBackgroundColour();
-        SetBackgroundColour("green");
+        s_colOld = wxColour("red");
+        SetBackgroundColour("white");

 
         m_lbSelectThis->SetForegroundColour("white");
         m_lbSelectThis->SetBackgroundColour("red");
 
         m_lbSelectThis->SetForegroundColour("white");
         m_lbSelectThis->SetBackgroundColour("red");


@@ -749,6 +923,12 @@ void MyPanel::OnListBox( wxCommandEvent &event )
 {
 //    GetParent()->Move(100, 100);
 
 {
 //    GetParent()->Move(100, 100);
 

+    if (event.GetInt() == -1)
+    {
+        m_text->AppendText( "ListBox has no selections anymore\n" );
+        return;
+    }
+

     wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
                                                      : m_listboxSorted;
 
     wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
                                                      : m_listboxSorted;
 


@@ -801,6 +981,7 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
                 m_lbSelectThis->Enable( event.GetInt() == 0 );
                 m_lbSelectNum->Enable( event.GetInt() == 0 );
                 m_listboxSorted->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:
                 break;
             }
         case ID_LISTBOX_SEL_NUM:


@@ -833,9 +1014,11 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
             {
                 int idx;
                 idx = m_listbox->GetSelection();
             {
                 int idx;
                 idx = m_listbox->GetSelection();

-                m_listbox->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_listbox->Delete( idx );

                 idx = m_listboxSorted->GetSelection();
                 idx = m_listboxSorted->GetSelection();

-                m_listboxSorted->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_listboxSorted->Delete( idx );

                 break;
             }
         case ID_LISTBOX_FONT:
                 break;
             }
         case ID_LISTBOX_FONT:


@@ -916,9 +1099,11 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
         case ID_CHOICE_DELETE:
             {
                 int idx = m_choice->GetSelection();
         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();
                 idx = m_choiceSorted->GetSelection();

-                m_choiceSorted->Delete( idx );
+                if ( idx != wxNOT_FOUND )
+                    m_choiceSorted->Delete( idx );

                 break;
             }
         case ID_CHOICE_FONT:
                 break;
             }
         case ID_CHOICE_FONT:


@@ -940,6 +1125,18 @@ void MyPanel::OnCombo( wxCommandEvent &event )
     m_text->AppendText( "\n" );
 }
 
     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 )
 {
     switch (event.GetId())
 void MyPanel::OnComboButtons( wxCommandEvent &event )
 {
     switch (event.GetId())


@@ -1023,22 +1220,21 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
     m_text->SetFont( *wxITALIC_FONT );
 }
 
     m_text->SetFont( *wxITALIC_FONT );
 }
 

-void MyPanel::OnUpdateLabel( wxCommandEvent &WXUNUSED(event) )
+void MyPanel::OnUpdateLabel( wxCommandEvent &event )

 {
 {

-    static bool s_long = TRUE;
-
-    s_long = !s_long;
-    m_label->SetLabel(s_long ? "very very very long text" : "shorter text");
+    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() );
 }
 
 void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
 {
     m_gauge->SetValue( m_slider->GetValue() );

+    m_gaugeVert->SetValue( m_slider->GetValue() / 2 );

 }
 
 #if wxUSE_SPINCTRL
 
 }
 
 #if wxUSE_SPINCTRL
 

-void MyPanel::OnSpinCtrl(wxCommandEvent& event)
+void MyPanel::OnSpinCtrl(wxSpinEvent& event)

 {
     wxString s;
     s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
 {
     wxString s;
     s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),


@@ -1107,6 +1303,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |
                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |

+                            wxPD_AUTO_HIDE |

                             wxPD_APP_MODAL |
                             wxPD_ELAPSED_TIME |
                             wxPD_ESTIMATED_TIME |
                             wxPD_APP_MODAL |
                             wxPD_ELAPSED_TIME |
                             wxPD_ESTIMATED_TIME |


@@ -1114,16 +1311,16 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 
 
     bool cont = TRUE;
 
 
     bool cont = TRUE;

-    for ( int i = 0; i < max && cont; i++ )
+    for ( int i = 0; i <= max && cont; i++ )

     {
         wxSleep(1);
     {
         wxSleep(1);

-        if ( i == max - 1 )
+        if ( i == max )

         {
             cont = dialog.Update(i, "That's all, folks!");
         }
         else if ( i == max / 2 )
         {
         {
             cont = dialog.Update(i, "That's all, folks!");
         }
         else if ( i == max / 2 )
         {

-            cont = dialog.Update(i, "Only a half left!");
+            cont = dialog.Update(i, "Only a half left (very long message)!");

         }
         else
         {
         }
         else
         {


@@ -1145,6 +1342,9 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
 
 MyPanel::~MyPanel()
 {
 
 MyPanel::~MyPanel()
 {

+    //wxLog::RemoveTraceMask(_T("focus"));
+    delete wxLog::SetActiveTarget(m_logTargetOld);
+

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


@@ -1153,14 +1353,15 @@ 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
 #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
 
 #endif // wxUSE_TOOLTIPS
 

-    EVT_MENU(MINIMAL_ENABLE_ALL, MyFrame::OnEnableAll)
+    EVT_MENU(CONTROLS_ENABLE_ALL, MyFrame::OnEnableAll)

 
     EVT_SIZE(MyFrame::OnSize)
     EVT_MOVE(MyFrame::OnMove)
 
     EVT_SIZE(MyFrame::OnSize)
     EVT_MOVE(MyFrame::OnMove)


@@ -1183,12 +1384,15 @@ void MyFrame::OnQuit (wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 {

-    wxBeginBusyCursor();
+    wxBusyCursor bc;

 
     wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
     dialog.ShowModal();
 
     wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK );
     dialog.ShowModal();

+}

 
 

-    wxEndBusyCursor();
+void MyFrame::OnClearLog(wxCommandEvent& WXUNUSED(event))
+{
+    m_panel->m_text->Clear();

 }
 
 #if wxUSE_TOOLTIPS
 }
 
 #if wxUSE_TOOLTIPS


@@ -1259,11 +1463,11 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__
         wxString msg;
         msg.Printf(
 #ifdef __WXMSW__

-                _T("Focus: wxWindow = %p, HWND = %08x"),
+                _T("Focus: %s, HWND = %08x"),

 #else
 #else

-                _T("Focus: wxWindow = %p"),
+                _T("Focus: %s"),

 #endif
 #endif

-                s_windowFocus
+                s_windowFocus->GetClassInfo()->GetClassName()

 #ifdef __WXMSW__
                 , s_windowFocus->GetHWND()
 #endif
 #ifdef __WXMSW__
                 , s_windowFocus->GetHWND()
 #endif


@@ -1273,14 +1477,41 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
     }
 }
 
     }
 }
 

-static void SetControlClientData(const char *name,
+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 SetControlClientData(const wxChar *name,

                                  wxControlWithItems *control)
 {
     size_t count = control->GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
         wxString s;
                                  wxControlWithItems *control)
 {
     size_t count = control->GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
         wxString s;

-        s.Printf("%s client data for '%s'",
+        s.Printf(wxT("%s client data for '%s'"),

                  name, control->GetString(n).c_str());
 
         control->SetClientObject(n, new wxStringClientData(s));
                  name, control->GetString(n).c_str());
 
         control->SetClientObject(n, new wxStringClientData(s));