X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0133d06b1a1dbb3bebc0ddb8cf2a7aa9d926a936..34326da778583ca8eab95f2e41738da2852a5a16:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 96be6becfb..8f8da745bc 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -18,50 +18,53 @@ // ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP - #include + #include "wx/wx.h" #endif -#include -#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/colordlg.h" +#include "wx/srchctrl.h" // define this to use XPMs everywhere (by default, BMPs are used under Win) -#ifdef __WXMSW__ +// BMPs use less space, but aren't compiled into the executable on other platforms +#ifdef __WINDOWS__ #define USE_XPM_BITMAPS 0 #else #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 + +// Define this as 0 for the platforms not supporting controls in toolbars +#define USE_CONTROLS_IN_TOOLBAR 1 + // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif + #if USE_XPM_BITMAPS - #include "mondrian.xpm" #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" @@ -72,6 +75,14 @@ #include "bitmaps/help.xpm" #endif // USE_XPM_BITMAPS +enum Positions +{ + TOOLBAR_LEFT, + TOOLBAR_TOP, + TOOLBAR_RIGHT, + TOOLBAR_BOTTOM +}; + // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- @@ -88,12 +99,14 @@ class MyFrame: public wxFrame { public: MyFrame(wxFrame *parent, - wxWindowID id = -1, - const wxString& title = "wxToolBar Sample", + wxWindowID id = wxID_ANY, + const wxString& title = wxT("wxToolBar Sample"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE); + long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); + virtual ~MyFrame(); + void PopulateToolbar(wxToolBarBase* toolBar); void RecreateToolbar(); void OnQuit(wxCommandEvent& event); @@ -101,32 +114,38 @@ public: void OnSize(wxSizeEvent& event); + void OnToggleToolbar(wxCommandEvent& event); void OnToggleAnotherToolbar(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 OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); } void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); } 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 OnToolbarBgCol(wxCommandEvent& event); + void OnToolbarCustomBitmap(wxCommandEvent& event); void OnToolLeftClick(wxCommandEvent& event); - void OnToolEnter(wxCommandEvent& event); + void OnToolRightClick(wxCommandEvent& event); + void OnToolDropdown(wxCommandEvent& event); void OnCombo(wxCommandEvent& event); void OnUpdateCopyAndCut(wxUpdateUIEvent& event); - - void OnToggleFullScreen(wxCommandEvent& event); - -#if USE_GENERIC_TBAR - virtual wxToolBar *OnCreateToolBar(long style, - wxWindowID id, - const wxString& name ); -#endif // USE_GENERIC_TBAR + void OnUpdateToggleHorzText(wxUpdateUIEvent& event); + void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event) + { event.Enable( m_tbar != NULL ); } private: void DoEnablePrint(); @@ -136,13 +155,32 @@ private: void LayoutChildren(); bool m_smallToolbar, - m_horzToolbar; + m_horzText, + 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; +#if USE_UNMANAGED_TOOLBAR + wxToolBar *m_extraToolBar; +#endif + 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() }; @@ -152,17 +190,40 @@ private: const int ID_TOOLBAR = 500; +static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; + 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_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_TOGGLEFULLSCREEN, - IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, + IDM_TOOLBAR_TOGGLESEARCH, + IDM_TOOLBAR_TOGGLERADIOBTN1, + IDM_TOOLBAR_TOGGLERADIOBTN2, + IDM_TOOLBAR_TOGGLERADIOBTN3, IDM_TOOLBAR_CHANGE_TOOLTIP, ID_COMBO = 1000 @@ -181,27 +242,47 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(wxID_HELP, MyFrame::OnAbout) + EVT_MENU(IDM_TOOLBAR_TOGGLE_TOOLBAR, MyFrame::OnToggleToolbar) 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) 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_TOGGLEFULLSCREEN, MyFrame::OnToggleFullScreen) + 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(-1, MyFrame::OnToolLeftClick) + 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_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) + + EVT_UPDATE_UI_RANGE(IDM_TOOLBAR_TOGGLERADIOBTN1, + IDM_TOOLBAR_TOGGLERADIOBTN3, + MyFrame::OnUpdateToggleRadioBtn) + EVT_UPDATE_UI(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, + MyFrame::OnUpdateToggleHorzText) END_EVENT_TABLE() // ============================================================================ @@ -218,119 +299,217 @@ IMPLEMENT_APP(MyApp) // main frame bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main frame window - MyFrame* frame = new MyFrame((wxFrame *) NULL, -1, - "wxToolBar Sample", - wxPoint(100, 100), wxSize(450, 300)); + MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY, + wxT("wxToolBar Sample"), + wxPoint(100, 100), wxSize(650, 300)); - frame->Show(TRUE); + frame->Show(true); - frame->SetStatusText("Hello, wxWindows"); +#if wxUSE_STATUSBAR + frame->SetStatusText(wxT("Hello, wxWidgets")); +#endif - SetTopWindow(frame); + wxInitAllImageHandlers(); - return TRUE; + return true; } void MyFrame::RecreateToolbar() { +#ifdef __WXWINCE__ + // On Windows CE, we should not delete the + // previous toolbar in case it contains the menubar. + // We'll try to accommodate this usage in due course. + wxToolBar* toolBar = CreateToolBar(); +#else // delete and recreate the toolbar 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); - long style = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE; - 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; toolBar = CreateToolBar(style, ID_TOOLBAR); - toolBar->SetMargins( 4, 4 ); +#endif + PopulateToolbar(toolBar); +} + +void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) +{ // Set up toolbar - wxBitmap toolBarBitmaps[8]; + enum + { + Tool_new, + Tool_open, + Tool_save, + Tool_copy, + Tool_cut, + Tool_paste, + Tool_print, + Tool_help, + Tool_Max + }; + + wxBitmap toolBarBitmaps[Tool_Max]; #if USE_XPM_BITMAPS - toolBarBitmaps[0] = wxBitmap(new_xpm); - toolBarBitmaps[1] = wxBitmap(open_xpm); - toolBarBitmaps[2] = wxBitmap(save_xpm); - toolBarBitmaps[3] = wxBitmap(copy_xpm); - toolBarBitmaps[4] = wxBitmap(cut_xpm); - toolBarBitmaps[5] = wxBitmap(paste_xpm); - toolBarBitmaps[6] = wxBitmap(print_xpm); - toolBarBitmaps[7] = wxBitmap(help_xpm); + #define INIT_TOOL_BMP(bmp) \ + toolBarBitmaps[Tool_##bmp] = wxBitmap(bmp##_xpm) #else // !USE_XPM_BITMAPS - toolBarBitmaps[0] = wxBITMAP(new); - toolBarBitmaps[1] = wxBITMAP(open); - toolBarBitmaps[2] = wxBITMAP(save); - toolBarBitmaps[3] = wxBITMAP(copy); - toolBarBitmaps[4] = wxBITMAP(cut); - toolBarBitmaps[5] = wxBITMAP(paste); - toolBarBitmaps[6] = wxBITMAP(print); - toolBarBitmaps[7] = wxBITMAP(help); + #define INIT_TOOL_BMP(bmp) \ + toolBarBitmaps[Tool_##bmp] = wxBITMAP(bmp) #endif // USE_XPM_BITMAPS/!USE_XPM_BITMAPS + INIT_TOOL_BMP(new); + INIT_TOOL_BMP(open); + INIT_TOOL_BMP(save); + INIT_TOOL_BMP(copy); + INIT_TOOL_BMP(cut); + INIT_TOOL_BMP(paste); + INIT_TOOL_BMP(print); + INIT_TOOL_BMP(help); + + int w = toolBarBitmaps[Tool_new].GetWidth(), + h = toolBarBitmaps[Tool_new].GetHeight(); + if ( !m_smallToolbar ) { - int w = 2*toolBarBitmaps[0].GetWidth(), - h = 2*toolBarBitmaps[0].GetHeight(); - for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ ) + w *= 2; + h *= 2; + + for ( size_t n = Tool_new; n < WXSIZEOF(toolBarBitmaps); n++ ) { toolBarBitmaps[n] = - wxImage(toolBarBitmaps[n]).Scale(w, h).ConvertToBitmap(); + wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h)); } - - toolBar->SetToolBitmapSize(wxSize(w, h)); } -#ifdef __WXMSW__ - int width = 24; -#else - int width = 16; -#endif + // 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")); - int currentX = 5; + 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_NEW, toolBarBitmaps[0], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "New file"); - currentX += width + 5; - toolBar->AddTool(wxID_OPEN, toolBarBitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file"); + toolBar->AddTool(wxID_OPEN, wxT("Open"), + toolBarBitmaps[Tool_open], wxNullBitmap, wxITEM_NORMAL, + wxT("Open file"), wxT("This is help for open file tool")); - // neither the generic nor Motif native toolbars really support this -#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) +#if USE_CONTROLS_IN_TOOLBAR // adding a combo to a vertical toolbar is not very smart - if ( m_horzToolbar ) + if ( !toolBar->IsVertical() ) { - wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, "", wxDefaultPosition, wxSize(200,-1) ); - combo->Append("This"); - combo->Append("is a"); - combo->Append("combobox"); - combo->Append("in a"); - combo->Append("toolbar"); -/* - wxTextCtrl *combo = new wxTextCtrl( toolBar, -1, "", wxDefaultPosition, wxSize(80,-1) ); -*/ - 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 - - currentX += width + 5; - toolBar->AddTool(wxID_SAVE, toolBarBitmaps[2], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 1"); - currentX += width + 5; - toolBar->AddTool(wxID_COPY, toolBarBitmaps[3], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Toggle button 2"); - currentX += width + 5; - toolBar->AddTool(wxID_CUT, toolBarBitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Toggle/Untoggle help button"); - currentX += width + 5; - toolBar->AddTool(wxID_PASTE, toolBarBitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste"); - currentX += width + 5; - toolBar->AddTool(wxID_PRINT, toolBarBitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Delete this tool"); - currentX += width + 5; +#endif // USE_CONTROLS_IN_TOOLBAR + + 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(); - toolBar->AddTool(wxID_HELP, toolBarBitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help button"); + + if ( m_useCustomDisabled ) + { + wxBitmap bmpDisabled(w, h); + { + wxMemoryDC dc; + dc.SelectObject(bmpDisabled); + dc.DrawBitmap(toolBarBitmaps[Tool_print], 0, 0); + + wxPen pen(*wxRED, 5); + dc.SetPen(pen); + dc.DrawLine(0, 0, w, h); + } + + toolBar->AddTool(wxID_PRINT, wxT("Print"), toolBarBitmaps[Tool_print], + bmpDisabled); + } + else + { + 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.")); + } + + // 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(); - toolBar->SetRows(m_horzToolbar ? m_rows : 10 / m_rows); + toolBar->SetRows(toolBar->IsVertical() ? toolBar->GetToolsCount() / m_rows + : m_rows); } // ---------------------------------------------------------------------------- @@ -347,80 +526,143 @@ MyFrame::MyFrame(wxFrame* parent, : wxFrame(parent, id, title, pos, size, style) { m_tbar = NULL; - m_textWindow = new wxTextCtrl(this, -1, "", wxPoint(0, 0), wxSize(-1, -1), wxTE_MULTILINE); - m_smallToolbar = TRUE; - m_horzToolbar = TRUE; + m_smallToolbar = true; + m_horzText = false; + m_useCustomDisabled = false; + m_showTooltips = true; + m_searchTool = NULL; + m_rows = 1; + m_nPrint = 1; +#if wxUSE_STATUSBAR // Give it a status line CreateStatusBar(); +#endif // Give it an icon - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // Make a menubar wxMenu *tbarMenu = new wxMenu; - tbarMenu->Append(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, - "Toggle &another toolbar\tCtrl-A", - "Show/hide another test toolbar", - TRUE); - - tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBARSIZE, - "&Toggle toolbar size\tCtrl-S", - "Toggle between big/small toolbar", - TRUE); - tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBARORIENT, - "Toggle toolbar &orientation\tCtrl-O", - "Toggle toolbar orientation", - TRUE); - tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBARROWS, - "Toggle number of &rows\tCtrl-R", - "Toggle number of toolbar rows between 1 and 2", - TRUE); + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR, + wxT("Toggle &toolbar\tCtrl-Z"), + wxT("Show or hide the toolbar")); - tbarMenu->AppendSeparator(); + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, + wxT("Toggle &another toolbar\tCtrl-A"), + wxT("Show/hide another test toolbar")); + + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, + wxT("Toggle hori&zontal text\tCtrl-H"), + wxT("Show text under/alongside the icon")); + + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARSIZE, + wxT("&Toggle toolbar size\tCtrl-S"), + wxT("Toggle between big/small toolbar")); + + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS, + wxT("Toggle number of &rows\tCtrl-R"), + wxT("Toggle number of toolbar rows between 1 and 2")); + + 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->Append(IDM_TOOLBAR_ENABLEPRINT, "&Enable print button\tCtrl-E", ""); - tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, "&Delete print button\tCtrl-D", ""); - tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, "&Insert print button\tCtrl-I", ""); - tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, "Toggle &help button\tCtrl-T", ""); + + tbarMenu->AppendSeparator(); + 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->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, "Change tool tip", ""); + + 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->Append(IDM_TOOLBAR_TOGGLEFULLSCREEN, "Toggle &full screen mode\tCtrl-F", ""); + 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; - fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" ); + fileMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"), wxT("Quit toolbar sample") ); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_HELP, "&About", "About toolbar sample"); + helpMenu->Append(wxID_HELP, wxT("&About"), wxT("About toolbar sample")); wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE ); - menuBar->Append(fileMenu, "&File"); - menuBar->Append(tbarMenu, "&Toolbar"); - menuBar->Append(helpMenu, "&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); + menuBar->Check(IDM_TOOLBAR_TOGGLE_TOOLBAR, 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(); -} -#if USE_GENERIC_TBAR + 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 -wxToolBar* MyFrame::OnCreateToolBar(long style, - wxWindowID id, - const wxString& name) -{ - return (wxToolBar *)new wxToolBarSimple(this, id, - wxDefaultPosition, wxDefaultSize, - style, name); + 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); } -#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() { @@ -429,8 +671,7 @@ void MyFrame::LayoutChildren() int offset; if ( m_tbar ) { - m_tbar->SetSize(-1, size.y); - m_tbar->Move(0, 0); + m_tbar->SetSize(0, 0, wxDefaultCoord, size.y); offset = m_tbar->GetSize().x; } @@ -439,7 +680,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) @@ -454,23 +695,56 @@ void MyFrame::OnSize(wxSizeEvent& event) } } +void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event)) +{ + wxToolBar *tbar = GetToolBar(); + + if ( !tbar ) + { + RecreateToolbar(); + } + 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; + } +} + +void MyFrame::OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event)) +{ + m_horzText = !m_horzText; + + RecreateToolbar(); +} + void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) { if ( m_tbar ) { - delete m_tbar; - m_tbar = NULL; + wxDELETE(m_tbar); } else { - m_tbar = new wxToolBar(this, -1, + long style = GetToolBar() ? GetToolBar()->GetWindowStyle() + : TOOLBAR_STYLE; + style &= ~wxTB_HORIZONTAL; + style |= wxTB_VERTICAL; + + m_tbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTB_VERTICAL); - m_tbar->AddTool(wxID_HELP, wxBITMAP(help), - wxNullBitmap, FALSE, - NULL, - "This is the help button", - "This is the long help for the help button"); + style); + + m_tbar->SetMargins(4, 4); + + 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->AddTool(wxID_HELP, wxT("Help"), wxBITMAP(help)); + m_tbar->Realize(); } @@ -489,42 +763,68 @@ 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); + wxToolBar* const toolBar = GetToolBar(); + toolBar->SetRows(toolBar->IsVertical() ? toolBar->GetToolsCount() / m_rows + : m_rows); //RecreateToolbar(); -- this is unneeded } -void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnToggleTooltips(wxCommandEvent& WXUNUSED(event)) { - m_horzToolbar = !m_horzToolbar; + m_showTooltips = !m_showTooltips; RecreateToolbar(); } +void MyFrame::OnToggleCustomDisabled(wxCommandEvent& WXUNUSED(event)) +{ + m_useCustomDisabled = !m_useCustomDisabled; + + RecreateToolbar(); +} + +void MyFrame::OnChangeOrientation(wxCommandEvent& event) +{ + 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(); +} + void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } -void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnAbout(wxCommandEvent& event) { - (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar"); + if ( event.IsChecked() ) + m_textWindow->WriteText( wxT("Help button down now.\n") ); + else + m_textWindow->WriteText( wxT("Help button up now.\n") ); + + (void)wxMessageBox(wxT("wxWidgets toolbar sample"), wxT("About wxToolBar")); } 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_HELP) - { - if ( event.GetExtraLong() != 0 ) - m_textWindow->WriteText( _T("Help button down now.\n") ); - else - m_textWindow->WriteText( _T("Help button up now.\n") ); - } - if (event.GetId() == wxID_COPY) { DoEnablePrint(); @@ -541,25 +841,36 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event) } } +void MyFrame::OnToolRightClick(wxCommandEvent& event) +{ + m_textWindow->AppendText( + wxString::Format(wxT("Tool %d right clicked.\n"), + (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() { + if ( !m_nPrint ) + return; + wxToolBarBase *tb = GetToolBar(); - if (tb->GetToolEnabled(wxID_PRINT)) - tb->EnableTool( wxID_PRINT, FALSE ); - else - tb->EnableTool( wxID_PRINT, TRUE ); + tb->EnableTool(wxID_PRINT, !tb->GetToolEnabled(wxID_PRINT)); } void MyFrame::DoDeletePrint() { - wxToolBarBase *tb = GetToolBar(); + if ( !m_nPrint ) + return; + wxToolBarBase *tb = GetToolBar(); tb->DeleteTool( wxID_PRINT ); + + m_nPrint--; } void MyFrame::DoToggleHelp() @@ -568,42 +879,125 @@ void MyFrame::DoToggleHelp() 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::OnUpdateToggleHorzText(wxUpdateUIEvent& event) +{ + wxToolBar *tbar = GetToolBar(); + event.Enable( tbar && + tbar->HasFlag(wxTB_TEXT) && + !tbar->HasFlag(wxTB_NOICONS) ); +} + void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event)) { - GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button")); + GetToolBar()->SetToolShortHelp(wxID_NEW, wxT("New toolbar button")); } -void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnToolbarStyle(wxCommandEvent& event) { - wxBitmap bmp = wxBITMAP(print); + long style = GetToolBar()->GetWindowStyle(); + style &= ~(wxTB_NOICONS | wxTB_HORZ_TEXT); - GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap, - FALSE, (wxObject *) NULL, - "Delete this tool", - "This button was inserted into the toolbar"); + switch ( event.GetId() ) + { + case IDM_TOOLBAR_SHOW_TEXT: + style |= wxTB_NOICONS | (m_horzText ? wxTB_HORZ_TEXT : wxTB_TEXT); + break; - GetToolBar()->Realize(); + case IDM_TOOLBAR_SHOW_ICONS: + // nothing to do + break; + + case IDM_TOOLBAR_SHOW_BOTH: + style |= (m_horzText ? wxTB_HORZ_TEXT : wxTB_TEXT); + } + + GetToolBar()->SetWindowStyle(style); } -void MyFrame::OnToolEnter(wxCommandEvent& event) +void MyFrame::OnToolbarBgCol(wxCommandEvent& WXUNUSED(event)) { - if (event.GetSelection() > -1) + wxColour col = wxGetColourFromUser + ( + this, + GetToolBar()->GetBackgroundColour(), + "Toolbar background colour" + ); + if ( col.IsOk() ) { - wxString str; - str.Printf(_T("This is tool number %d"), event.GetSelection()); - SetStatusText(str); + GetToolBar()->SetBackgroundColour(col); + GetToolBar()->Refresh(); } - else - SetStatusText(""); } -void MyFrame::OnToggleFullScreen(wxCommandEvent& event) +void MyFrame::OnToolbarCustomBitmap(wxCommandEvent& WXUNUSED(event)) { - ShowFullScreen(!IsFullScreen()); + m_pathBmp = wxLoadFileSelector("custom bitmap", ""); + + RecreateToolbar(); } +void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) +{ + m_nPrint++; + + wxToolBarBase *tb = GetToolBar(); + tb->InsertTool(0, wxID_PRINT, wxT("New print"), + wxBITMAP(print), wxNullBitmap, + wxITEM_NORMAL, + wxT("Delete this tool"), + wxT("This button was inserted into the toolbar")); + + // must call Realize() after adding a new button + tb->Realize(); +} + +void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) +{ + if ( m_tbar ) + { + m_tbar->ToggleTool(IDM_TOOLBAR_OTHER_1 + + 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(); +}