add unit test for wxTextCtrl::SetSelection()

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

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 26928541ed990cef7ca48655b64366d32df77068..c1c95e469b6283c13370cc22bf83eaf05aeb2380 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,19 +43,19 @@
     #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // resources
 // ----------------------------------------------------------------------------


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


@@ -96,7 +104,9 @@ public:
             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,7 +119,7 @@ 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 OnToggleTooltips(wxCommandEvent& event);
     void OnToggleCustomDisabled(wxCommandEvent& event);
     void OnToggleToolbarRows(wxCommandEvent& event);
     void OnToggleTooltips(wxCommandEvent& event);
     void OnToggleCustomDisabled(wxCommandEvent& event);


@@ -119,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);
 


@@ -134,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();


@@ -148,7 +155,6 @@ private:
     void LayoutChildren();
 
     bool                m_smallToolbar,
     void LayoutChildren();
 
     bool                m_smallToolbar,

-                        m_horzToolbar,

                         m_horzText,
                         m_useCustomDisabled,
                         m_showTooltips;
                         m_horzText,
                         m_useCustomDisabled,
                         m_showTooltips;


@@ -157,10 +163,24 @@ private:
     // the number of print buttons we have (they're added/removed dynamically)
     size_t              m_nPrint;
 
     // 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()
 };
 


@@ -174,29 +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_TOGGLETOOLTIPS,
     IDM_TOOLBAR_TOGGLECUSTOMDISABLED,
     IDM_TOOLBAR_TOGGLETOOLBARROWS,
     IDM_TOOLBAR_TOGGLETOOLTIPS,
     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
 };


@@ -218,8 +246,8 @@ 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_TOGGLETOOLTIPS, MyFrame::OnToggleTooltips)
     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARROWS, MyFrame::OnToggleToolbarRows)
     EVT_MENU(IDM_TOOLBAR_TOGGLETOOLTIPS, MyFrame::OnToggleTooltips)
     EVT_MENU(IDM_TOOLBAR_TOGGLECUSTOMDISABLED, MyFrame::OnToggleCustomDisabled)


@@ -228,20 +256,25 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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_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)
 


@@ -266,15 +299,13 @@ 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,
                                  _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);
 


@@ -282,6 +313,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,12 +332,33 @@ 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;
 
     if ( m_showTooltips )
         style &= ~wxTB_NO_TOOLTIPS;


@@ -317,6 +371,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
     {


@@ -367,23 +426,34 @@ void MyFrame::RecreateToolbar()
 
     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"));
+    toolBar->AddTool(wxID_NEW, _T("New"),
+                     toolBarBitmaps[Tool_new], wxNullBitmap, wxITEM_DROPDOWN,
+                     _T("New file"), _T("This is help for new file tool"));
+
+    wxMenu* menu = new wxMenu;
+    menu->Append(wxID_ANY, _T("&First dummy item"));
+    menu->Append(wxID_ANY, _T("&Second dummy item"));
+    menu->AppendSeparator();
+    menu->Append(wxID_EXIT, _T("Exit"));
+    toolBar->SetDropdownMenu(wxID_NEW, menu);

 
 

-    // the generic toolbar doesn't really support this
-#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXX11__) || defined(__WXUNIVERSAL__)
+    toolBar->AddTool(wxID_OPEN, _T("Open"),
+                     toolBarBitmaps[Tool_open], wxNullBitmap, wxITEM_NORMAL,
+                     _T("Open file"), _T("This is help for open file tool"));
+
+#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) );
+        wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(100,-1) );

         combo->Append(_T("This"));
         combo->Append(_T("is a"));
         combo->Append(_T("combobox"));
         combo->Append(_T("in a"));
         combo->Append(_T("toolbar"));
         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);
+        toolBar->AddControl(combo, _T("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_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);


@@ -415,11 +485,25 @@ 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();
 

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

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


@@ -438,10 +522,10 @@ 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_showTooltips = true;
     m_horzText = false;
     m_useCustomDisabled = false;
     m_showTooltips = true;

+    m_searchTool = NULL;

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


@@ -472,10 +556,6 @@ MyFrame::MyFrame(wxFrame* parent,
                               _T("&Toggle toolbar size\tCtrl-S"),
                               _T("Toggle between big/small toolbar"));
 
                               _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"));
-

     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
                               _T("Toggle number of &rows\tCtrl-R"),
                               _T("Toggle number of toolbar rows between 1 and 2"));
     tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS,
                               _T("Toggle number of &rows\tCtrl-R"),
                               _T("Toggle number of toolbar rows between 1 and 2"));


@@ -490,21 +570,39 @@ MyFrame::MyFrame(wxFrame* parent,
 
 
     tbarMenu->AppendSeparator();
 
 
     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->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,
+                              _T("Set toolbar at the top of the window"),
+                              _T("Set toolbar at the top of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_LEFT_ORIENTATION,
+                              _T("Set toolbar at the left of the window"),
+                              _T("Set toolbar at the left of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_BOTTOM_ORIENTATION,
+                              _T("Set toolbar at the bottom of the window"),
+                              _T("Set toolbar at the bottom of the window"));
+    tbarMenu->AppendRadioItem(IDM_TOOLBAR_RIGHT_ORIENTATION,
+                              _T("Set toolbar at the right edge of the window"),
+                              _T("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, _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_BG_COL, _T("Choose bac&kground colour..."));
+    tbarMenu->Append(IDM_TOOLBAR_CUSTOM_PATH, _T("Custom &bitmap...\tCtrl-B"));
+
+    wxMenu *toolMenu = new wxMenu;
+    toolMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"));
+    toolMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"));
+    toolMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"));
+    toolMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLESEARCH, _T("Toggle &search field\tCtrl-F"));
+    toolMenu->AppendSeparator();
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN1, _T("Toggle &1st radio button\tCtrl-1"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"));
+    toolMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"));
+    toolMenu->AppendSeparator();
+    toolMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tooltip of \"New\""));

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


@@ -516,6 +614,7 @@ MyFrame::MyFrame(wxFrame* parent,
 
     menuBar->Append(fileMenu, _T("&File"));
     menuBar->Append(tbarMenu, _T("&Toolbar"));
 
     menuBar->Append(fileMenu, _T("&File"));
     menuBar->Append(tbarMenu, _T("&Toolbar"));

+    menuBar->Append(toolMenu, _T("Tool&s"));

     menuBar->Append(helpMenu, _T("&Help"));
 
     // Associate the menu bar with the frame
     menuBar->Append(helpMenu, _T("&Help"));
 
     // Associate the menu bar with the frame


@@ -524,25 +623,40 @@ MyFrame::MyFrame(wxFrame* parent,
     menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true);
     menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, 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
+    
+    m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
+
+    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);

 }
 
 }
 

-#if USE_GENERIC_TBAR
-
-wxToolBar* MyFrame::OnCreateToolBar(long style,
-                                    wxWindowID id,
-                                    const wxString& name)
+MyFrame::~MyFrame()

 {
 {

-    return (wxToolBar *)new wxToolBarSimple(this, id,
-                                            wxDefaultPosition, wxDefaultSize,
-                                            style, name);
+    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);
+    }

 }
 
 }
 

-#endif // USE_GENERIC_TBAR
-

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


@@ -559,7 +673,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)


@@ -641,7 +755,7 @@ 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
 }


@@ -660,10 +774,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();
 }
 


@@ -742,6 +869,36 @@ 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))
+{
+    static const int searchPos = 3;
+
+    wxToolBarBase * const tb = GetToolBar();
+    if ( !m_searchTool )
+    {
+        wxSearchCtrl * const srch = new wxSearchCtrl(tb, wxID_ANY, "needle");
+        srch->SetMinSize(wxSize(80, -1));
+        m_searchTool = tb->InsertControl(searchPos, 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->InsertTool(searchPos, 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() );


@@ -782,6 +939,28 @@ 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 = wxFileSelector(_T("Custom bitmap path"));
+
+    RecreateToolbar();
+}
+

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


@@ -797,22 +976,6 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event))
     tb->Realize();
 }
 
     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 )


@@ -821,3 +984,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( _T("Dropdown on tool %d\n"), event.GetId());
+    m_textWindow->WriteText( str );
+
+    event.Skip();
+}