X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8927d6d11c67c84ff51b499d99c6f7a9670d3b78..f62edb0ecd881e790dd72b7f49da29e943200edb:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 5284572c39..687dab791b 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -25,15 +25,15 @@ #endif #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif -#include -#include -#include - -// 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" +#include "wx/spinctrl.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 @@ -43,25 +43,25 @@ #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 - #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 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 + // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- -#if USE_XPM_BITMAPS +#if !defined(__WXMSW__) && !defined(__WXPM__) #include "mondrian.xpm" +#endif + +#if USE_XPM_BITMAPS #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" @@ -72,6 +72,14 @@ #include "bitmaps/help.xpm" #endif // USE_XPM_BITMAPS +enum Positions +{ + TOOLBAR_LEFT, + TOOLBAR_TOP, + TOOLBAR_RIGHT, + TOOLBAR_BOTTOM +}; + // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- @@ -94,6 +102,7 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); + void PopulateToolbar(wxToolBarBase* toolBar); void RecreateToolbar(); void OnQuit(wxCommandEvent& event); @@ -106,8 +115,9 @@ public: 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 OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); } @@ -118,10 +128,11 @@ public: void OnToggleRadioBtn(wxCommandEvent& event); void OnToolbarStyle(wxCommandEvent& event); + void OnToolbarCustomBitmap(wxCommandEvent& event); void OnToolLeftClick(wxCommandEvent& event); void OnToolRightClick(wxCommandEvent& event); - void OnToolEnter(wxCommandEvent& event); + void OnToolDropdown(wxCommandEvent& event); void OnCombo(wxCommandEvent& event); @@ -130,12 +141,6 @@ public: 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(); @@ -144,18 +149,27 @@ private: void LayoutChildren(); 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_nPrint; + // store toolbar position for future use + Positions m_toolbarPosition; + wxTextCtrl *m_textWindow; + wxPanel *m_panel; + wxToolBar *m_extraToolBar; + wxToolBar *m_tbar; + // the path to the custom bitmap for the test toolbar tool + wxString m_pathBmp; + DECLARE_EVENT_TABLE() }; @@ -170,8 +184,8 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; enum { IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, - IDM_TOOLBAR_TOGGLETOOLBARORIENT, IDM_TOOLBAR_TOGGLETOOLBARROWS, + IDM_TOOLBAR_TOGGLETOOLTIPS, IDM_TOOLBAR_TOGGLECUSTOMDISABLED, IDM_TOOLBAR_ENABLEPRINT, IDM_TOOLBAR_DELETEPRINT, @@ -187,12 +201,17 @@ enum IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_ICONS, IDM_TOOLBAR_SHOW_BOTH, - + 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, - ID_COMBO = 1000 + ID_COMBO = 1000, + ID_SPIN = 1001 }; // ---------------------------------------------------------------------------- @@ -212,9 +231,10 @@ 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_RANGE(IDM_TOOLBAR_TOP_ORIENTATION, IDM_TOOLBAR_RIGHT_ORIENTATION, MyFrame::OnChangeOrientation) 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) @@ -228,13 +248,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter) 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) @@ -259,15 +282,13 @@ IMPLEMENT_APP(MyApp) // 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"), -#ifdef __WXWINCE__ - wxDefaultPosition, wxDefaultSize -#else - wxPoint(100, 100), wxSize(550, 300) -#endif - ); + wxPoint(100, 100), wxSize(550, 300)); frame->Show(true); @@ -275,6 +296,8 @@ bool MyApp::OnInit() frame->SetStatusText(_T("Hello, wxWidgets")); #endif + wxInitAllImageHandlers(); + SetTopWindow(frame); return true; @@ -296,8 +319,27 @@ void MyFrame::RecreateToolbar() 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; @@ -305,6 +347,11 @@ void MyFrame::RecreateToolbar() toolBar = CreateToolBar(style, ID_TOOLBAR); #endif + PopulateToolbar(toolBar); +} + +void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) +{ // Set up toolbar enum { @@ -351,25 +398,46 @@ void MyFrame::RecreateToolbar() 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")); + toolBar->SetToolBitmapSize(wxSize(w, h)); + + 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); + + toolBar->AddTool(wxID_OPEN, _T("Open"), + toolBarBitmaps[Tool_open], wxNullBitmap, wxITEM_NORMAL, + _T("Open file"), _T("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 wxUSE_TOOLBAR_NATIVE && !defined(__WXX11__) || defined(__WXUNIVERSAL__) // adding a combo to a vertical toolbar is not very smart - if ( m_horzToolbar ) + if ( !( toolBar->IsVertical() ) ) { - wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), 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")); - toolBar->AddControl(combo); + toolBar->AddControl(combo, _T("Combo Label")); + + wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 0, 100 ); + toolBar->AddControl( spin ); + + wxTextCtrl *text = new wxTextCtrl( toolBar, -1, wxT("text"), wxDefaultPosition, wxSize(80,wxDefaultCoord) ); + toolBar->AddControl( text ); + + wxSearchCtrl *srch = new wxSearchCtrl( toolBar, -1, wxT("xx"), wxDefaultPosition, wxSize(80,wxDefaultCoord), wxSUNKEN_BORDER ); + toolBar->AddControl( srch ); } #endif // toolbars which don't support controls @@ -403,11 +471,25 @@ void MyFrame::RecreateToolbar() 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(); - toolBar->SetRows(m_horzToolbar ? m_rows : 10 / m_rows); + toolBar->SetRows(!(toolBar->IsVertical()) ? m_rows : 10 / m_rows); } // ---------------------------------------------------------------------------- @@ -426,9 +508,10 @@ MyFrame::MyFrame(wxFrame* parent, m_tbar = NULL; m_smallToolbar = true; - m_horzToolbar = true; m_horzText = false; m_useCustomDisabled = false; + m_showTooltips = true; + m_rows = 1; m_nPrint = 1; @@ -458,35 +541,50 @@ MyFrame::MyFrame(wxFrame* parent, _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_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->AppendSeparator(); + 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->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->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->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->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") ); @@ -504,26 +602,31 @@ MyFrame::MyFrame(wxFrame* parent, SetMenuBar(menuBar); 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(); - m_textWindow = new wxTextCtrl(this, wxID_ANY, _T(""), 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); + 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); +#else + m_extraToolBar = NULL; +#endif + + m_textWindow = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); + + wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL); + m_panel->SetSizer(sizer); + if (m_extraToolBar) + sizer->Add(m_extraToolBar, 0, wxEXPAND, 0); + sizer->Add(m_textWindow, 1, wxEXPAND, 0); } -#endif // USE_GENERIC_TBAR - void MyFrame::LayoutChildren() { wxSize size = GetClientSize(); @@ -540,7 +643,7 @@ void MyFrame::LayoutChildren() 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) @@ -622,11 +725,18 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event)) // 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 } +void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event)) +{ + m_showTooltips = !m_showTooltips; + + RecreateToolbar(); +} + void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event)) { m_useCustomDisabled = !m_useCustomDisabled; @@ -634,10 +744,23 @@ void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event)) 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(); } @@ -756,6 +879,13 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event) 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++; @@ -771,22 +901,6 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) 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(_T("")); -#else - wxUnusedVar(event); -#endif // wxUSE_STATUSBAR -} - void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) { if ( m_tbar ) @@ -796,3 +910,11 @@ void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) } } +void MyFrame::OnToolDropdown(wxCommandEvent& event) +{ + wxString str; + str.Printf( _T("Dropdown on tool %d\n"), event.GetId()); + m_textWindow->WriteText( str ); + + event.Skip(); +}