Typo.

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index a1155218972cab31582e0f54d136a8e1ef968964..e8edd692980ec5e9d74022fe55919ee174e97baa 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -25,15 +25,13 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 #endif
 
 #endif
 

-#include <wx/toolbar.h>
-#include <wx/log.h>
-#include <wx/image.h>
-
-// define this to 1 to use wxToolBarSimple instead of the native one
-#define USE_GENERIC_TBAR 0
+#include "wx/toolbar.h"
+#include "wx/log.h"
+#include "wx/image.h"
+#include "wx/filedlg.h"

 
 // define this to use XPMs everywhere (by default, BMPs are used under Win)
 // BMPs use less space, but aren't compiled into the executable on other platforms
 
 // define this to use XPMs everywhere (by default, BMPs are used under Win)
 // BMPs use less space, but aren't compiled into the executable on other platforms


@@ -43,15 +41,6 @@
     #define USE_XPM_BITMAPS 1
 #endif
 
     #define USE_XPM_BITMAPS 1
 #endif
 

-#if USE_GENERIC_TBAR
-    #if !wxUSE_TOOLBAR_SIMPLE
-        #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
-               to 1 in setup.h and recompile the library.
-    #else
-        #include <wx/tbarsmpl.h>
-    #endif
-#endif // USE_GENERIC_TBAR
-

 #if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
     #error You need to enable XPM support to use XPM bitmaps with toolbar!
 #endif // USE_XPM_BITMAPS
 #if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
     #error You need to enable XPM support to use XPM bitmaps with toolbar!
 #endif // USE_XPM_BITMAPS


@@ -60,8 +49,11 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#if USE_XPM_BITMAPS
+#if !defined(__WXMSW__) && !defined(__WXPM__)

     #include "mondrian.xpm"
     #include "mondrian.xpm"

+#endif
+
+#if USE_XPM_BITMAPS

     #include "bitmaps/new.xpm"
     #include "bitmaps/open.xpm"
     #include "bitmaps/save.xpm"
     #include "bitmaps/new.xpm"
     #include "bitmaps/open.xpm"
     #include "bitmaps/save.xpm"


@@ -108,6 +100,7 @@ public:
     void OnToggleToolbarSize(wxCommandEvent& event);
     void OnToggleToolbarOrient(wxCommandEvent& event);
     void OnToggleToolbarRows(wxCommandEvent& event);
     void OnToggleToolbarSize(wxCommandEvent& event);
     void OnToggleToolbarOrient(wxCommandEvent& event);
     void OnToggleToolbarRows(wxCommandEvent& event);

+    void OnToggleTooltips(wxCommandEvent& event);

     void OnToggleCustomDisabled(wxCommandEvent& event);
 
     void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); }
     void OnToggleCustomDisabled(wxCommandEvent& event);
 
     void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); }


@@ -118,6 +111,7 @@ public:
     void OnToggleRadioBtn(wxCommandEvent& event);
 
     void OnToolbarStyle(wxCommandEvent& event);
     void OnToggleRadioBtn(wxCommandEvent& event);
 
     void OnToolbarStyle(wxCommandEvent& event);

+    void OnToolbarCustomBitmap(wxCommandEvent& event);

 
     void OnToolLeftClick(wxCommandEvent& event);
     void OnToolRightClick(wxCommandEvent& event);
 
     void OnToolLeftClick(wxCommandEvent& event);
     void OnToolRightClick(wxCommandEvent& event);


@@ -130,12 +124,6 @@ public:
     void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
         { event.Enable( m_tbar != NULL ); }
 
     void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event)
         { event.Enable( m_tbar != NULL ); }
 

-#if USE_GENERIC_TBAR
-    virtual wxToolBar *OnCreateToolBar(long style,
-                                       wxWindowID id,
-                                       const wxString& name );
-#endif // USE_GENERIC_TBAR
-

 private:
     void DoEnablePrint();
     void DoDeletePrint();
 private:
     void DoEnablePrint();
     void DoDeletePrint();


@@ -146,7 +134,8 @@ private:
     bool                m_smallToolbar,
                         m_horzToolbar,
                         m_horzText,
     bool                m_smallToolbar,
                         m_horzToolbar,
                         m_horzText,

-                        m_useCustomDisabled;
+                        m_useCustomDisabled,
+                        m_showTooltips;

     size_t              m_rows;             // 1 or 2 only
 
     // the number of print buttons we have (they're added/removed dynamically)
     size_t              m_rows;             // 1 or 2 only
 
     // the number of print buttons we have (they're added/removed dynamically)


@@ -156,6 +145,9 @@ private:
 
     wxToolBar          *m_tbar;
 
 
     wxToolBar          *m_tbar;
 

+    // the path to the custom bitmap for the test toolbar tool
+    wxString            m_pathBmp;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -172,6 +164,7 @@ enum
     IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
     IDM_TOOLBAR_TOGGLETOOLBARORIENT,
     IDM_TOOLBAR_TOGGLETOOLBARROWS,
     IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
     IDM_TOOLBAR_TOGGLETOOLBARORIENT,
     IDM_TOOLBAR_TOGGLETOOLBARROWS,

+    IDM_TOOLBAR_TOGGLETOOLTIPS,

     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
     IDM_TOOLBAR_ENABLEPRINT,
     IDM_TOOLBAR_DELETEPRINT,
     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
     IDM_TOOLBAR_ENABLEPRINT,
     IDM_TOOLBAR_DELETEPRINT,


@@ -187,6 +180,7 @@ enum
     IDM_TOOLBAR_SHOW_TEXT,
     IDM_TOOLBAR_SHOW_ICONS,
     IDM_TOOLBAR_SHOW_BOTH,
     IDM_TOOLBAR_SHOW_TEXT,
     IDM_TOOLBAR_SHOW_ICONS,
     IDM_TOOLBAR_SHOW_BOTH,

+    IDM_TOOLBAR_CUSTOM_PATH,

 
     IDM_TOOLBAR_OTHER_1,
     IDM_TOOLBAR_OTHER_2,
 
     IDM_TOOLBAR_OTHER_1,
     IDM_TOOLBAR_OTHER_2,


@@ -215,6 +209,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARORIENT, MyFrame::OnToggleToolbarOrient)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARORIENT, MyFrame::OnToggleToolbarOrient)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)

+    EVT_MENU(IDM_TOOLBAR_TOGGLETOOLTIPS, MyFrame::OnToggleTooltips)

     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
 
     EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)
     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
 
     EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)


@@ -228,6 +223,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)
 
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)
 

+    EVT_MENU(IDM_TOOLBAR_CUSTOM_PATH, MyFrame::OnToolbarCustomBitmap)
+

     EVT_MENU(wxID_ANY, MyFrame::OnToolLeftClick)
 
     EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)
     EVT_MENU(wxID_ANY, MyFrame::OnToolLeftClick)
 
     EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo)


@@ -262,12 +259,7 @@ bool MyApp::OnInit()
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  _T("wxToolBar Sample"),
     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
                                  _T("wxToolBar Sample"),

-#ifdef __WXWINCE__
-                                 wxDefaultPosition, wxDefaultSize
-#else
-                                 wxPoint(100, 100), wxSize(550, 300)
-#endif
-                                 );
+                                  wxPoint(100, 100), wxSize(550, 300));

 
     frame->Show(true);
 
 
     frame->Show(true);
 


@@ -275,6 +267,8 @@ bool MyApp::OnInit()
     frame->SetStatusText(_T("Hello, wxWidgets"));
 #endif
 
     frame->SetStatusText(_T("Hello, wxWidgets"));
 #endif
 

+    wxInitAllImageHandlers();
+

     SetTopWindow(frame);
 
     return true;
     SetTopWindow(frame);
 
     return true;


@@ -299,6 +293,11 @@ void MyFrame::RecreateToolbar()
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
 
     style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT);
     style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
 

+    if ( m_showTooltips )
+        style &= ~wxTB_NO_TOOLTIPS;
+    else
+        style |= wxTB_NO_TOOLTIPS;
+

     if ( style & wxTB_TEXT && !(style & wxTB_NOICONS) && m_horzText )
         style |= wxTB_HORZ_LAYOUT;
 
     if ( style & wxTB_TEXT && !(style & wxTB_NOICONS) && m_horzText )
         style |= wxTB_HORZ_LAYOUT;
 


@@ -351,19 +350,19 @@ void MyFrame::RecreateToolbar()
             toolBarBitmaps[n] =
                 wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
         }
             toolBarBitmaps[n] =
                 wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
         }

-
-        toolBar->SetToolBitmapSize(wxSize(w, h));

     }
 
     }
 

+    toolBar->SetToolBitmapSize(wxSize(w, h));
+

     toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file"));
     toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
 
     // the generic toolbar doesn't really support this
     toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file"));
     toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
 
     // the generic toolbar doesn't really support this

-#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
+#if wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__)

     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {
     // adding a combo to a vertical toolbar is not very smart
     if ( m_horzToolbar )
     {

-        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultCoord) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(200,wxDefaultCoord) );

         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));


@@ -403,6 +402,20 @@ void MyFrame::RecreateToolbar()
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[Tool_help], _T("Help button"), wxITEM_CHECK);
 
     toolBar->AddSeparator();
     toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[Tool_help], _T("Help button"), wxITEM_CHECK);
 

+    if ( !m_pathBmp.empty() )
+    {
+        // create a tool with a custom bitmap for testing
+        wxImage img(m_pathBmp);
+        if ( img.Ok() )
+        {
+            if ( img.GetWidth() > w && img.GetHeight() > h )
+                img = img.GetSubImage(wxRect(0, 0, w, h));
+
+            toolBar->AddSeparator();
+            toolBar->AddTool(wxID_ANY, _T("Custom"), img);
+        }
+    }
+

     // after adding the buttons to the toolbar, must call Realize() to reflect
     // the changes
     toolBar->Realize();
     // after adding the buttons to the toolbar, must call Realize() to reflect
     // the changes
     toolBar->Realize();


@@ -429,6 +442,8 @@ MyFrame::MyFrame(wxFrame* parent,
     m_horzToolbar = true;
     m_horzText = false;
     m_useCustomDisabled = false;
     m_horzToolbar = true;
     m_horzText = false;
     m_useCustomDisabled = false;

+    m_showTooltips = true;
+

     m_rows = 1;
     m_nPrint = 1;
 
     m_rows = 1;
     m_nPrint = 1;
 


@@ -466,6 +481,10 @@ MyFrame::MyFrame(wxFrame* parent,
                               _T("Toggle number of &rows\tCtrl-R"),
                               _T("Toggle number of toolbar rows between 1 and 2"));
 
                               _T("Toggle number of &rows\tCtrl-R"),
                               _T("Toggle number of toolbar rows between 1 and 2"));
 

+    tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLTIPS,
+                              _T("Show &tooltips\tCtrl-L"),
+                              _T("Show tooltips for the toolbar tools"));
+

     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
                               _T("Use c&ustom disabled images\tCtrl-U"),
                               _T("Switch between using system-generated and custom disabled images"));
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
                               _T("Use c&ustom disabled images\tCtrl-U"),
                               _T("Switch between using system-generated and custom disabled images"));


@@ -473,20 +492,22 @@ MyFrame::MyFrame(wxFrame* parent,
 
     tbarMenu->AppendSeparator();
 
 
     tbarMenu->AppendSeparator();
 

-    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), _T(""));
-    tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), _T(""));
-    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), _T(""));
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"));
+    tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"));
+    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"));
+    tbarMenu->AppendSeparator();
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"));
+    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"));

     tbarMenu->AppendSeparator();
     tbarMenu->AppendSeparator();

-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"), _T(""));
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), _T(""));
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), _T(""));
+    tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"));

     tbarMenu->AppendSeparator();
     tbarMenu->AppendSeparator();

-    tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T(""));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, _T("Show &text\tCtrl-Alt-T"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, _T("Show &icons\tCtrl-Alt-I"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, _T("Show &both\tCtrl-Alt-B"));

     tbarMenu->AppendSeparator();
     tbarMenu->AppendSeparator();

-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, _T("Show &text\tAlt-T"));
-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, _T("Show &icons\tAlt-I"));
-    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, _T("Show &both\tAlt-B"));
+    tbarMenu->Append(IDM_TOOLBAR_CUSTOM_PATH, _T("Custom &bitmap...\tCtrl-B"));

 
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit toolbar sample") );
 
     wxMenu *fileMenu = new wxMenu;
     fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit toolbar sample") );


@@ -504,26 +525,14 @@ MyFrame::MyFrame(wxFrame* parent,
     SetMenuBar(menuBar);
 
     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
     SetMenuBar(menuBar);
 
     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);

+    menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true);

 
     // Create the toolbar
     RecreateToolbar();
 
 
     // Create the toolbar
     RecreateToolbar();
 

-    m_textWindow = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
+    m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);

 }
 
 }
 

-#if USE_GENERIC_TBAR
-
-wxToolBar* MyFrame::OnCreateToolBar(long style,
-                                    wxWindowID id,
-                                    const wxString& name)
-{
-    return (wxToolBar *)new wxToolBarSimple(this, id,
-                                            wxDefaultPosition, wxDefaultSize,
-                                            style, name);
-}
-
-#endif // USE_GENERIC_TBAR
-

 void MyFrame::LayoutChildren()
 {
     wxSize size = GetClientSize();
 void MyFrame::LayoutChildren()
 {
     wxSize size = GetClientSize();


@@ -587,7 +596,8 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

-        long style = GetToolBar()->GetWindowStyle();
+        long style = GetToolBar() ? GetToolBar()->GetWindowStyle()
+                                  : TOOLBAR_STYLE;

         style &= ~wxTB_HORIZONTAL;
         style |= wxTB_VERTICAL;
 
         style &= ~wxTB_HORIZONTAL;
         style |= wxTB_VERTICAL;
 


@@ -626,6 +636,13 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event))
     //RecreateToolbar(); -- this is unneeded
 }
 
     //RecreateToolbar(); -- this is unneeded
 }
 

+void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event))
+{
+    m_showTooltips = !m_showTooltips;
+
+    RecreateToolbar();
+}
+

 void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event))
 {
     m_useCustomDisabled = !m_useCustomDisabled;
 void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event))
 {
     m_useCustomDisabled = !m_useCustomDisabled;


@@ -755,6 +772,13 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event)
     GetToolBar()->SetWindowStyle(style);
 }
 
     GetToolBar()->SetWindowStyle(style);
 }
 

+void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    m_pathBmp = wxFileSelector(_T("Custom bitmap path"));
+
+    RecreateToolbar();
+}
+

 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {
     m_nPrint++;
 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {
     m_nPrint++;


@@ -780,7 +804,7 @@ void MyFrame::OnToolEnter(wxCommandEvent& event)
         SetStatusText(str);
     }
     else
         SetStatusText(str);
     }
     else

-        SetStatusText(_T(""));
+        SetStatusText(wxEmptyString);

 #else
     wxUnusedVar(event);
 #endif // wxUSE_STATUSBAR
 #else
     wxUnusedVar(event);
 #endif // wxUSE_STATUSBAR


@@ -794,4 +818,3 @@ void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }

-