Fix harmless gcc warning about uninitialized mask in PNG saving code.

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index a841af51734c91ac0a6c5c6f1279c35178a5dcca..6f8327a9113b207e4b5fc054ece35ecabcd7036c 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -31,9 +31,9 @@
 #include "wx/toolbar.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #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/filedlg.h"
+#include "wx/colordlg.h"
+#include "wx/srchctrl.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,25 +43,25 @@
     #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
 

+// If this is 1, the sample will test an extra toolbar identical to the
+// main one, but not managed by the frame. This can test subtle differences
+// in the way toolbars are handled, especially on Mac where there is one
+// native, 'installed' toolbar.
+#define USE_UNMANAGED_TOOLBAR 0
+
+// Define this as 0 for the platforms not supporting controls in toolbars
+#define USE_CONTROLS_IN_TOOLBAR 1
+

 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)

-    #include "mondrian.xpm"
+    #include "../sample.xpm"

 #endif
 
 #if USE_XPM_BITMAPS
 #endif
 
 #if USE_XPM_BITMAPS


@@ -75,6 +75,14 @@
     #include "bitmaps/help.xpm"
 #endif // USE_XPM_BITMAPS
 
     #include "bitmaps/help.xpm"
 #endif // USE_XPM_BITMAPS
 

+enum Positions
+{
+    TOOLBAR_LEFT,
+    TOOLBAR_TOP,
+    TOOLBAR_RIGHT,
+    TOOLBAR_BOTTOM
+};
+

 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // classes
 // ----------------------------------------------------------------------------


@@ -92,11 +100,13 @@ class MyFrame: public wxFrame
 public:
     MyFrame(wxFrame *parent,
             wxWindowID id = wxID_ANY,
 public:
     MyFrame(wxFrame *parent,
             wxWindowID id = wxID_ANY,

-            const wxString& title = _T("wxToolBar Sample"),
+            const wxString& title = wxT("wxToolBar Sample"),

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE);
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE);

+    virtual ~MyFrame();

 
 

+    void PopulateToolbar(wxToolBarBase* toolBar);

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


@@ -109,8 +119,9 @@ public:
     void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event));
 
     void OnToggleToolbarSize(wxCommandEvent& event);
     void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event));
 
     void OnToggleToolbarSize(wxCommandEvent& event);

-    void OnToggleToolbarOrient(wxCommandEvent& event);
+    void OnChangeOrientation(wxCommandEvent& event);

     void OnToggleToolbarRows(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,13 +129,16 @@ public:
     void OnInsertPrint(wxCommandEvent& event);
     void OnChangeToolTip(wxCommandEvent& event);
     void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }
     void OnInsertPrint(wxCommandEvent& event);
     void OnChangeToolTip(wxCommandEvent& event);
     void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); }

+    void OnToggleSearch(wxCommandEvent& event);

     void OnToggleRadioBtn(wxCommandEvent& event);
 
     void OnToolbarStyle(wxCommandEvent& event);
     void OnToggleRadioBtn(wxCommandEvent& event);
 
     void OnToolbarStyle(wxCommandEvent& event);

+    void OnToolbarBgCol(wxCommandEvent& event);
+    void OnToolbarCustomBitmap(wxCommandEvent& event);

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

-    void OnToolEnter(wxCommandEvent& event);
+    void OnToolDropdown(wxCommandEvent& event);

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


@@ -133,12 +147,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();


@@ -147,18 +155,32 @@ private:
     void LayoutChildren();
 
     bool                m_smallToolbar,
     void LayoutChildren();
 
     bool                m_smallToolbar,

-                        m_horzToolbar,

                         m_horzText,
                         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_nPrint;
 
     size_t              m_rows;             // 1 or 2 only
 
     // the number of print buttons we have (they're added/removed dynamically)
     size_t              m_nPrint;
 

+    // store toolbar position for future use
+    Positions           m_toolbarPosition;
+

     wxTextCtrl         *m_textWindow;
 
     wxTextCtrl         *m_textWindow;
 

+    wxPanel            *m_panel;
+#if USE_UNMANAGED_TOOLBAR
+    wxToolBar          *m_extraToolBar;
+#endif
+

     wxToolBar          *m_tbar;
 
     wxToolBar          *m_tbar;
 

+    // the path to the custom bitmap for the test toolbar tool
+    wxString            m_pathBmp;
+
+    // the search tool, initially NULL
+    wxToolBarToolBase *m_searchTool;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -172,28 +194,37 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
 
 enum
 {
 
 enum
 {

-    IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200,
-    IDM_TOOLBAR_TOGGLETOOLBARORIENT,
+    // toolbar menu items
+    IDM_TOOLBAR_TOGGLE_TOOLBAR = 200,
+    IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,
+    IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
+    IDM_TOOLBAR_TOGGLETOOLBARSIZE,

     IDM_TOOLBAR_TOGGLETOOLBARROWS,
     IDM_TOOLBAR_TOGGLETOOLBARROWS,

+    IDM_TOOLBAR_TOGGLETOOLTIPS,

     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,

+    IDM_TOOLBAR_SHOW_TEXT,
+    IDM_TOOLBAR_SHOW_ICONS,
+    IDM_TOOLBAR_SHOW_BOTH,
+    IDM_TOOLBAR_BG_COL,
+    IDM_TOOLBAR_CUSTOM_PATH,
+    IDM_TOOLBAR_TOP_ORIENTATION,
+    IDM_TOOLBAR_LEFT_ORIENTATION,
+    IDM_TOOLBAR_BOTTOM_ORIENTATION,
+    IDM_TOOLBAR_RIGHT_ORIENTATION,
+    IDM_TOOLBAR_OTHER_1,
+    IDM_TOOLBAR_OTHER_2,
+    IDM_TOOLBAR_OTHER_3,
+
+    // tools menu items

     IDM_TOOLBAR_ENABLEPRINT,
     IDM_TOOLBAR_DELETEPRINT,
     IDM_TOOLBAR_INSERTPRINT,
     IDM_TOOLBAR_TOGGLEHELP,
     IDM_TOOLBAR_ENABLEPRINT,
     IDM_TOOLBAR_DELETEPRINT,
     IDM_TOOLBAR_INSERTPRINT,
     IDM_TOOLBAR_TOGGLEHELP,

+    IDM_TOOLBAR_TOGGLESEARCH,

     IDM_TOOLBAR_TOGGLERADIOBTN1,
     IDM_TOOLBAR_TOGGLERADIOBTN2,
     IDM_TOOLBAR_TOGGLERADIOBTN3,
     IDM_TOOLBAR_TOGGLERADIOBTN1,
     IDM_TOOLBAR_TOGGLERADIOBTN2,
     IDM_TOOLBAR_TOGGLERADIOBTN3,

-    IDM_TOOLBAR_TOGGLE_TOOLBAR,
-    IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,
-    IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,

     IDM_TOOLBAR_CHANGE_TOOLTIP,
     IDM_TOOLBAR_CHANGE_TOOLTIP,

-    IDM_TOOLBAR_SHOW_TEXT,
-    IDM_TOOLBAR_SHOW_ICONS,
-    IDM_TOOLBAR_SHOW_BOTH,
-
-    IDM_TOOLBAR_OTHER_1,
-    IDM_TOOLBAR_OTHER_2,
-    IDM_TOOLBAR_OTHER_3,

 
     ID_COMBO = 1000
 };
 
     ID_COMBO = 1000
 };


@@ -215,29 +246,35 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText)
 
     EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar)
     EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText)
 

+    EVT_MENU_RANGE(IDM_TOOLBAR_TOP_ORIENTATION, IDM_TOOLBAR_RIGHT_ORIENTATION, MyFrame::OnChangeOrientation)

     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize)
     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_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_DELETEPRINT, MyFrame::OnDeletePrint)
     EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
     EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)
     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
 
     EVT_MENU(IDM_TOOLBAR_ENABLEPRINT, MyFrame::OnEnablePrint)
     EVT_MENU(IDM_TOOLBAR_DELETEPRINT, MyFrame::OnDeletePrint)
     EVT_MENU(IDM_TOOLBAR_INSERTPRINT, MyFrame::OnInsertPrint)
     EVT_MENU(IDM_TOOLBAR_TOGGLEHELP, MyFrame::OnToggleHelp)

+    EVT_MENU(IDM_TOOLBAR_TOGGLESEARCH, MyFrame::OnToggleSearch)

     EVT_MENU_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, IDM_TOOLBAR_TOGGLERADIOBTN3,
                    MyFrame::OnToggleRadioBtn)
     EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
 
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)
     EVT_MENU_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, IDM_TOOLBAR_TOGGLERADIOBTN3,
                    MyFrame::OnToggleRadioBtn)
     EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip)
 
     EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH,
                    MyFrame::OnToolbarStyle)

+    EVT_MENU(IDM_TOOLBAR_BG_COL, MyFrame::OnToolbarBgCol)
+
+    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)
 

-    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)

     EVT_TOOL_RCLICKED(wxID_ANY, MyFrame::OnToolRightClick)
 
     EVT_TOOL_RCLICKED(wxID_ANY, MyFrame::OnToolRightClick)
 

+    EVT_TOOL_DROPDOWN(wxID_ANY, MyFrame::OnToolDropdown)
+

     EVT_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut)
     EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut)
 
     EVT_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut)
     EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut)
 


@@ -262,23 +299,21 @@ IMPLEMENT_APP(MyApp)
 // main frame
 bool MyApp::OnInit()
 {
 // main frame
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
     MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY,
     // 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
-                                 );
+                                 wxT("wxToolBar Sample"),
+                                  wxPoint(100, 100), wxSize(650, 300));

 
     frame->Show(true);
 
 #if wxUSE_STATUSBAR
 
     frame->Show(true);
 
 #if wxUSE_STATUSBAR

-    frame->SetStatusText(_T("Hello, wxWidgets"));
+    frame->SetStatusText(wxT("Hello, wxWidgets"));

 #endif
 
 #endif
 

-    SetTopWindow(frame);
+    wxInitAllImageHandlers();

 
     return true;
 }
 
     return true;
 }


@@ -295,12 +330,38 @@ void MyFrame::RecreateToolbar()
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
 
     wxToolBarBase *toolBar = GetToolBar();
     long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE;
 

+    if (toolBar && m_searchTool && m_searchTool->GetToolBar() == NULL)
+    {
+        // see ~MyFrame()
+        toolBar->AddTool(m_searchTool);
+    }
+    m_searchTool = NULL;
+

     delete toolBar;
 
     SetToolBar(NULL);
 
     delete toolBar;
 
     SetToolBar(NULL);
 

-    style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT);
-    style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL;
+    style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT);
+    switch( m_toolbarPosition )
+    {
+        case TOOLBAR_LEFT:
+            style |= wxTB_LEFT;
+            break;
+        case TOOLBAR_TOP:
+            style |= wxTB_TOP;
+            break;
+        case TOOLBAR_RIGHT:
+            style |= wxTB_RIGHT;
+            break;
+        case TOOLBAR_BOTTOM:
+        style |= wxTB_BOTTOM;
+        break;
+    }
+
+    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;


@@ -308,6 +369,11 @@ void MyFrame::RecreateToolbar()
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 #endif
 
     toolBar = CreateToolBar(style, ID_TOOLBAR);
 #endif
 

+    PopulateToolbar(toolBar);
+}
+
+void MyFrame::PopulateToolbar(wxToolBarBase* toolBar)
+{

     // Set up toolbar
     enum
     {
     // Set up toolbar
     enum
     {


@@ -354,32 +420,48 @@ 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->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file"));
-    toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file"));
+    // this call is actually unnecessary as the toolbar will adjust its tools
+    // size to fit the biggest icon used anyhow but it doesn't hurt neither
+    toolBar->SetToolBitmapSize(wxSize(w, h));
+
+    toolBar->AddTool(wxID_NEW, wxT("New"),
+                     toolBarBitmaps[Tool_new], wxNullBitmap, wxITEM_DROPDOWN,
+                     wxT("New file"), wxT("This is help for new file tool"));
+
+    wxMenu* menu = new wxMenu;
+    menu->Append(wxID_ANY, wxT("&First dummy item"));
+    menu->Append(wxID_ANY, wxT("&Second dummy item"));
+    menu->AppendSeparator();
+    menu->Append(wxID_EXIT, wxT("Exit"));
+    toolBar->SetDropdownMenu(wxID_NEW, menu);
+
+    toolBar->AddTool(wxID_OPEN, wxT("Open"),
+                     toolBarBitmaps[Tool_open], wxNullBitmap, wxITEM_NORMAL,
+                     wxT("Open file"), wxT("This is help for open file tool"));

 
 

-    // the generic toolbar doesn't really support this
-#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
+#if USE_CONTROLS_IN_TOOLBAR

     // adding a combo to a vertical toolbar is not very smart
     // adding a combo to a vertical toolbar is not very smart

-    if ( m_horzToolbar )
+    if ( !toolBar->IsVertical() )

     {
     {

-        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("in a"));
-        combo->Append(_T("toolbar"));
-        toolBar->AddControl(combo);
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(100,-1) );
+        combo->Append(wxT("This"));
+        combo->Append(wxT("is a"));
+        combo->Append(wxT("combobox"));
+        combo->Append(wxT("in a"));
+        combo->Append(wxT("toolbar"));
+        toolBar->AddControl(combo, wxT("Combo Label"));

     }
     }

-#endif // toolbars which don't support controls
+#endif // USE_CONTROLS_IN_TOOLBAR

 
 

-    toolBar->AddTool(wxID_SAVE, _T("Save"), toolBarBitmaps[Tool_save], _T("Toggle button 1"), wxITEM_CHECK);
-    toolBar->AddTool(wxID_COPY, _T("Copy"), toolBarBitmaps[Tool_copy], _T("Toggle button 2"), wxITEM_CHECK);
-    toolBar->AddTool(wxID_CUT, _T("Cut"), toolBarBitmaps[Tool_cut], _T("Toggle/Untoggle help button"));
-    toolBar->AddTool(wxID_PASTE, _T("Paste"), toolBarBitmaps[Tool_paste], _T("Paste"));
+    toolBar->AddTool(wxID_SAVE, wxT("Save"), toolBarBitmaps[Tool_save], wxT("Toggle button 1"), wxITEM_CHECK);
+
+    toolBar->AddSeparator();
+    toolBar->AddTool(wxID_COPY, wxT("Copy"), toolBarBitmaps[Tool_copy], wxT("Toggle button 2"), wxITEM_CHECK);
+    toolBar->AddTool(wxID_CUT, wxT("Cut"), toolBarBitmaps[Tool_cut], wxT("Toggle/Untoggle help button"));
+    toolBar->AddTool(wxID_PASTE, wxT("Paste"), toolBarBitmaps[Tool_paste], wxT("Paste"));
+    toolBar->AddSeparator();

 
     if ( m_useCustomDisabled )
     {
 
     if ( m_useCustomDisabled )
     {


@@ -394,23 +476,39 @@ void MyFrame::RecreateToolbar()
             dc.DrawLine(0, 0, w, h);
         }
 
             dc.DrawLine(0, 0, w, h);
         }
 

-        toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[Tool_print],
+        toolBar->AddTool(wxID_PRINT, wxT("Print"), toolBarBitmaps[Tool_print],

                          bmpDisabled);
     }
     else
     {
                          bmpDisabled);
     }
     else
     {

-        toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[Tool_print],
-                         _T("Delete this tool. This is a very long tooltip to test whether it does the right thing when the tooltip is more than Windows can cope with."));
+        toolBar->AddTool(wxID_PRINT, wxT("Print"), toolBarBitmaps[Tool_print],
+                         wxT("Delete this tool. This is a very long tooltip to test whether it does the right thing when the tooltip is more than Windows can cope with."));

     }
 
     }
 

-    toolBar->AddSeparator();
-    toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[Tool_help], _T("Help button"), wxITEM_CHECK);
+    // add a stretchable space before the "Help" button to make it
+    // right-aligned
+    toolBar->AddStretchableSpace();
+    toolBar->AddTool(wxID_HELP, wxT("Help"), toolBarBitmaps[Tool_help], wxT("Help button"), wxITEM_CHECK);
+
+    if ( !m_pathBmp.empty() )
+    {
+        // create a tool with a custom bitmap for testing
+        wxImage img(m_pathBmp);
+        if ( img.IsOk() )
+        {
+            if ( img.GetWidth() > w && img.GetHeight() > h )
+                img = img.GetSubImage(wxRect(0, 0, w, h));
+
+            toolBar->AddSeparator();
+            toolBar->AddTool(wxID_ANY, wxT("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();
 

-    toolBar->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
+    toolBar->SetRows(!(toolBar->IsVertical()) ? m_rows : 10 / m_rows);

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


@@ -429,9 +527,11 @@ MyFrame::MyFrame(wxFrame* parent,
     m_tbar = NULL;
 
     m_smallToolbar = true;
     m_tbar = NULL;
 
     m_smallToolbar = true;

-    m_horzToolbar = true;

     m_horzText = false;
     m_useCustomDisabled = false;
     m_horzText = false;
     m_useCustomDisabled = false;

+    m_showTooltips = true;
+    m_searchTool = NULL;
+

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


@@ -441,91 +541,127 @@ MyFrame::MyFrame(wxFrame* parent,
 #endif
 
     // Give it an icon
 #endif
 
     // Give it an icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR,
 
     // Make a menubar
     wxMenu *tbarMenu = new wxMenu;
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR,

-                              _T("Toggle &toolbar\tCtrl-Z"),
-                              _T("Show or hide the toolbar"));
+                              wxT("Toggle &toolbar\tCtrl-Z"),
+                              wxT("Show or hide the toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR,

-                              _T("Toggle &another toolbar\tCtrl-A"),
-                              _T("Show/hide another test toolbar"));
+                              wxT("Toggle &another toolbar\tCtrl-A"),
+                              wxT("Show/hide another test toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT,

-                              _T("Toggle hori&zontal text\tCtrl-H"),
-                              _T("Show text under/alongside the icon"));
+                              wxT("Toggle hori&zontal text\tCtrl-H"),
+                              wxT("Show text under/alongside the icon"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARSIZE,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARSIZE,

-                              _T("&Toggle toolbar size\tCtrl-S"),
-                              _T("Toggle between big/small toolbar"));
-
-    tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARORIENT,
-                              _T("Toggle toolbar &orientation\tCtrl-O"),
-                              _T("Toggle toolbar orientation"));
+                              wxT("&Toggle toolbar size\tCtrl-S"),
+                              wxT("Toggle between big/small toolbar"));

 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
 
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,

-                              _T("Toggle number of &rows\tCtrl-R"),
-                              _T("Toggle number of toolbar rows between 1 and 2"));
+                              wxT("Toggle number of &rows\tCtrl-R"),
+                              wxT("Toggle number of toolbar rows between 1 and 2"));

 
 

-    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_TOGGLETOOLTIPS,
+                              wxT("Show &tooltips\tCtrl-L"),
+                              wxT("Show tooltips for the toolbar tools"));

 
 

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

 
 

-    tbarMenu->AppendSeparator();

 
 

-    tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), wxEmptyString);
-    tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), wxEmptyString);
-    tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), wxEmptyString);
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), wxEmptyString);

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

-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"), wxEmptyString);
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), wxEmptyString);
-    tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), wxEmptyString);
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_TOP_ORIENTATION,
+                              wxT("Set toolbar at the top of the window"),
+                              wxT("Set toolbar at the top of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_LEFT_ORIENTATION,
+                              wxT("Set toolbar at the left of the window"),
+                              wxT("Set toolbar at the left of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_BOTTOM_ORIENTATION,
+                              wxT("Set toolbar at the bottom of the window"),
+                              wxT("Set toolbar at the bottom of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_RIGHT_ORIENTATION,
+                              wxT("Set toolbar at the right edge of the window"),
+                              wxT("Set toolbar at the right edge of the window"));

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

-    tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), wxEmptyString);
+
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, wxT("Show &text\tCtrl-Alt-T"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, wxT("Show &icons\tCtrl-Alt-I"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, wxT("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_BG_COL, wxT("Choose bac&kground colour..."));
+    tbarMenu->Append(IDM_TOOLBAR_CUSTOM_PATH, wxT("Custom &bitmap...\tCtrl-B"));
+
+    wxMenu *toolMenu = new wxMenu;
+    toolMenu->Append(IDM_TOOLBAR_ENABLEPRINT, wxT("&Enable print button\tCtrl-E"));
+    toolMenu->Append(IDM_TOOLBAR_DELETEPRINT, wxT("&Delete print button\tCtrl-D"));
+    toolMenu->Append(IDM_TOOLBAR_INSERTPRINT, wxT("&Insert print button\tCtrl-I"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLEHELP, wxT("Toggle &help button\tCtrl-T"));
+    toolMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLESEARCH, wxT("Toggle &search field\tCtrl-F"));
+    toolMenu->AppendSeparator();
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, wxT("Toggle &1st radio button\tCtrl-1"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, wxT("Toggle &2nd radio button\tCtrl-2"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, wxT("Toggle &3rd radio button\tCtrl-3"));
+    toolMenu->AppendSeparator();
+    toolMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, wxT("Change tooltip of \"New\""));

 
     wxMenu *fileMenu = new wxMenu;
 
     wxMenu *fileMenu = new wxMenu;

-    fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit toolbar sample") );
+    fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Quit toolbar sample") );

 
     wxMenu *helpMenu = new wxMenu;
 
     wxMenu *helpMenu = new wxMenu;

-    helpMenu->Append(wxID_HELP, _T("&About"), _T("About toolbar sample"));
+    helpMenu->Append(wxID_HELP, wxT("&About"), wxT("About toolbar sample"));

 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 
 
     wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE );
 

-    menuBar->Append(fileMenu, _T("&File"));
-    menuBar->Append(tbarMenu, _T("&Toolbar"));
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(fileMenu, wxT("&File"));
+    menuBar->Append(tbarMenu, wxT("&Toolbar"));
+    menuBar->Append(toolMenu, wxT("Tool&s"));
+    menuBar->Append(helpMenu, wxT("&Help"));

 
     // Associate the menu bar with the frame
     SetMenuBar(menuBar);
 
 
     // Associate the menu bar with the frame
     SetMenuBar(menuBar);
 

+    menuBar->Check(IDM_TOOLBAR_TOGGLE_TOOLBAR, true);

     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);

+    menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true);
+
+    menuBar->Check(IDM_TOOLBAR_TOP_ORIENTATION, true );
+    m_toolbarPosition = TOOLBAR_TOP;

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

-    m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE);
-}
+    m_panel = new wxPanel(this, wxID_ANY);
+#if USE_UNMANAGED_TOOLBAR
+    m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP);
+    PopulateToolbar(m_extraToolBar);
+#endif

 
 

-#if USE_GENERIC_TBAR
+    m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);

 
 

-wxToolBar* MyFrame::OnCreateToolBar(long style,
-                                    wxWindowID id,
-                                    const wxString& name)
-{
-    return (wxToolBar *)new wxToolBarSimple(this, id,
-                                            wxDefaultPosition, wxDefaultSize,
-                                            style, name);
+    wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+    m_panel->SetSizer(sizer);
+#if USE_UNMANAGED_TOOLBAR
+    if (m_extraToolBar)
+        sizer->Add(m_extraToolBar, 0, wxEXPAND, 0);
+#endif
+    sizer->Add(m_textWindow, 1, wxEXPAND, 0);

 }
 
 }
 

-#endif // USE_GENERIC_TBAR
+MyFrame::~MyFrame()
+{
+    if ( m_searchTool && !m_searchTool->GetToolBar() )
+    {
+        // we currently can't delete a toolbar tool ourselves, so we have to
+        // attach it to the toolbar just for it to be deleted, this is pretty
+        // ugly and will need to be changed
+        GetToolBar()->AddTool(m_searchTool);
+    }
+}

 
 void MyFrame::LayoutChildren()
 {
 
 void MyFrame::LayoutChildren()
 {


@@ -543,7 +679,7 @@ void MyFrame::LayoutChildren()
         offset = 0;
     }
 
         offset = 0;
     }
 

-    m_textWindow->SetSize(offset, 0, size.x - offset, size.y);
+    m_panel->SetSize(offset, 0, size.x - offset, size.y);

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


@@ -568,9 +704,11 @@ void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event))
     }
     else
     {
     }
     else
     {

+        // notice that there is no need to call SetToolBar(NULL) here (although
+        // this it is harmless to do and it must be called if you do not delete
+        // the toolbar but keep it for later reuse), just delete the toolbar
+        // directly and it will reset the associated frame toolbar pointer

         delete tbar;
         delete tbar;

-
-        SetToolBar(NULL);

     }
 }
 
     }
 }
 


@@ -585,8 +723,7 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
 {
     if ( m_tbar )
     {
 {
     if ( m_tbar )
     {

-        delete m_tbar;
-        m_tbar = NULL;
+        wxDELETE(m_tbar);

     }
     else
     {
     }
     else
     {


@@ -601,11 +738,11 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event))
 
         m_tbar->SetMargins(4, 4);
 
 
         m_tbar->SetMargins(4, 4);
 

-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_1, _T("First"), wxBITMAP(new));
-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_2, _T("Second"), wxBITMAP(open));
-        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, _T("Third"), wxBITMAP(save));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_1, wxT("First"), wxBITMAP(new));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_2, wxT("Second"), wxBITMAP(open));
+        m_tbar->AddRadioTool(IDM_TOOLBAR_OTHER_3, wxT("Third"), wxBITMAP(save));

         m_tbar->AddSeparator();
         m_tbar->AddSeparator();

-        m_tbar->AddTool(wxID_HELP, _T("Help"), wxBITMAP(help));
+        m_tbar->AddTool(wxID_HELP, wxT("Help"), wxBITMAP(help));

 
         m_tbar->Realize();
     }
 
         m_tbar->Realize();
     }


@@ -625,11 +762,18 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event))
     // m_rows may be only 1 or 2
     m_rows = 3 - m_rows;
 
     // m_rows may be only 1 or 2
     m_rows = 3 - m_rows;
 

-    GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
+    GetToolBar()->SetRows(!(GetToolBar()->IsVertical()) ? m_rows : 10 / m_rows);

 
     //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;


@@ -637,10 +781,23 @@ void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event))
     RecreateToolbar();
 }
 
     RecreateToolbar();
 }
 

-void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnChangeOrientation(wxCommandEvent& event)

 {
 {

-    m_horzToolbar = !m_horzToolbar;
-
+    switch( event.GetId() )
+    {
+        case IDM_TOOLBAR_LEFT_ORIENTATION:
+            m_toolbarPosition = TOOLBAR_LEFT;
+            break;
+        case IDM_TOOLBAR_TOP_ORIENTATION:
+            m_toolbarPosition = TOOLBAR_TOP;
+            break;
+        case IDM_TOOLBAR_RIGHT_ORIENTATION:
+            m_toolbarPosition = TOOLBAR_RIGHT;
+            break;
+        case IDM_TOOLBAR_BOTTOM_ORIENTATION:
+            m_toolbarPosition = TOOLBAR_BOTTOM;
+            break;
+    }

     RecreateToolbar();
 }
 
     RecreateToolbar();
 }
 


@@ -652,17 +809,17 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& event)
 {
     if ( event.IsChecked() )
 void MyFrame::OnAbout(wxCommandEvent& event)
 {
     if ( event.IsChecked() )

-        m_textWindow->WriteText( _T("Help button down now.\n") );
+        m_textWindow->WriteText( wxT("Help button down now.\n") );

     else
     else

-        m_textWindow->WriteText( _T("Help button up now.\n") );
+        m_textWindow->WriteText( wxT("Help button up now.\n") );

 
 

-    (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar"));
+    (void)wxMessageBox(wxT("wxWidgets toolbar sample"), wxT("About wxToolBar"));

 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 {
     wxString str;
 }
 
 void MyFrame::OnToolLeftClick(wxCommandEvent& event)
 {
     wxString str;

-    str.Printf( _T("Clicked on tool %d\n"), event.GetId());
+    str.Printf( wxT("Clicked on tool %d\n"), event.GetId());

     m_textWindow->WriteText( str );
 
     if (event.GetId() == wxID_COPY)
     m_textWindow->WriteText( str );
 
     if (event.GetId() == wxID_COPY)


@@ -679,22 +836,18 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event)
     {
         DoDeletePrint();
     }
     {
         DoDeletePrint();
     }

-    if (event.GetId() == IDM_TOOLBAR_OTHER_1)
-    {
-        m_tbar->Realize();
-    }

 }
 
 void MyFrame::OnToolRightClick(wxCommandEvent& event)
 {
     m_textWindow->AppendText(
 }
 
 void MyFrame::OnToolRightClick(wxCommandEvent& event)
 {
     m_textWindow->AppendText(

-            wxString::Format(_T("Tool %d right clicked.\n"),
+            wxString::Format(wxT("Tool %d right clicked.\n"),

                              (int) event.GetInt()));
 }
 
 void MyFrame::OnCombo(wxCommandEvent& event)
 {
                              (int) event.GetInt()));
 }
 
 void MyFrame::OnCombo(wxCommandEvent& event)
 {

-    wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str());
+    wxLogStatus(wxT("Combobox string '%s' selected"), event.GetString().c_str());

 }
 
 void MyFrame::DoEnablePrint()
 }
 
 void MyFrame::DoEnablePrint()


@@ -723,6 +876,34 @@ void MyFrame::DoToggleHelp()
     tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
 }
 
     tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) );
 }
 

+void MyFrame::OnToggleSearch(wxCommandEvent& WXUNUSED(event))
+{
+    wxToolBarBase * const tb = GetToolBar();
+    if ( !m_searchTool )
+    {
+        wxSearchCtrl * const srch = new wxSearchCtrl(tb, wxID_ANY, "needle");
+        srch->SetMinSize(wxSize(80, -1));
+        m_searchTool = tb->AddControl(srch);
+    }
+    else // tool already exists
+    {
+        wxControl * const win = m_searchTool->GetControl();
+        if ( m_searchTool->GetToolBar() )
+        {
+            // attached now, remove it
+            win->Hide();
+            tb->RemoveTool(m_searchTool->GetId());
+        }
+        else // tool exists in detached state, attach it back
+        {
+            tb->AddTool(m_searchTool);
+            win->Show();
+        }
+    }
+
+    tb->Realize();
+}
+

 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {
     event.Enable( m_textWindow->CanCopy() );
 void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event)
 {
     event.Enable( m_textWindow->CanCopy() );


@@ -738,7 +919,7 @@ void MyFrame::OnUpdateToggleHorzText(wxUpdateUIEvent& event)
 
 void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event))
 {

-    GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button"));
+    GetToolBar()->SetToolShortHelp(wxID_NEW, wxT("New toolbar button"));

 }
 
 void MyFrame::OnToolbarStyle(wxCommandEvent& event)
 }
 
 void MyFrame::OnToolbarStyle(wxCommandEvent& event)


@@ -763,37 +944,43 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event)
     GetToolBar()->SetWindowStyle(style);
 }
 
     GetToolBar()->SetWindowStyle(style);
 }
 

+void MyFrame::OnToolbarBgCol(wxCommandEvent& WXUNUSED(event))
+{
+    wxColour col = wxGetColourFromUser
+                   (
+                    this,
+                    GetToolBar()->GetBackgroundColour(),
+                    "Toolbar background colour"
+                   );
+    if ( col.IsOk() )
+    {
+        GetToolBar()->SetBackgroundColour(col);
+        GetToolBar()->Refresh();
+    }
+}
+
+void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event))
+{
+    m_pathBmp = wxLoadFileSelector("custom bitmap", "");
+
+    RecreateToolbar();
+}
+

 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {
     m_nPrint++;
 
     wxToolBarBase *tb = GetToolBar();
 void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
 {
     m_nPrint++;
 
     wxToolBarBase *tb = GetToolBar();

-    tb->InsertTool(0, wxID_PRINT, _T("New print"),
+    tb->InsertTool(0, wxID_PRINT, wxT("New print"),

                    wxBITMAP(print), wxNullBitmap,
                    wxITEM_NORMAL,
                    wxBITMAP(print), wxNullBitmap,
                    wxITEM_NORMAL,

-                   _T("Delete this tool"),
-                   _T("This button was inserted into the toolbar"));
+                   wxT("Delete this tool"),
+                   wxT("This button was inserted into the toolbar"));

 
     // must call Realize() after adding a new button
     tb->Realize();
 }
 
 
     // must call Realize() after adding a new button
     tb->Realize();
 }
 

-void MyFrame::OnToolEnter(wxCommandEvent& event)
-{
-#if wxUSE_STATUSBAR
-    if (event.GetSelection() > -1)
-    {
-        wxString str;
-        str.Printf(_T("This is tool number %d"), event.GetSelection());
-        SetStatusText(str);
-    }
-    else
-        SetStatusText(wxEmptyString);
-#else
-    wxUnusedVar(event);
-#endif // wxUSE_STATUSBAR
-}
-

 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
 {
     if ( m_tbar )
 void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
 {
     if ( m_tbar )


@@ -802,3 +989,12 @@ void MyFrame::OnToggleRadioBtn(wxCommandEvent& event)
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }
                             event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true);
     }
 }

+
+void MyFrame::OnToolDropdown(wxCommandEvent& event)
+{
+    wxString str;
+    str.Printf( wxT("Dropdown on tool %d\n"), event.GetId());
+    m_textWindow->WriteText( str );
+
+    event.Skip();
+}