X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/229de929f3576fb97aae8d8a00cdd663d0972c80..fe21801d4a3d44c86c5e0e142d77246837a83105:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 4071436847..c1c95e469b 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/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 @@ -43,25 +43,28 @@ #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 // ---------------------------------------------------------------------------- -#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 +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, + wxWindowID id = wxID_ANY, const wxString& title = _T("wxToolBar Sample"), 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); @@ -103,31 +116,36 @@ public: 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); - -#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(); @@ -137,16 +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() }; @@ -160,19 +194,37 @@ 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_TOGGLE_TOOLBAR, - IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, + IDM_TOOLBAR_TOGGLESEARCH, + IDM_TOOLBAR_TOGGLERADIOBTN1, + IDM_TOOLBAR_TOGGLERADIOBTN2, + IDM_TOOLBAR_TOGGLERADIOBTN3, IDM_TOOLBAR_CHANGE_TOOLTIP, - IDM_TOOLBAR_SHOW_TEXT, - IDM_TOOLBAR_SHOW_ICONS, - IDM_TOOLBAR_SHOW_BOTH, ID_COMBO = 1000 }; @@ -192,28 +244,45 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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_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(IDM_TOOLBAR_BG_COL, MyFrame::OnToolbarBgCol) + + EVT_MENU(IDM_TOOLBAR_CUSTOM_PATH, MyFrame::OnToolbarCustomBitmap) - EVT_MENU(-1, MyFrame::OnToolLeftClick) + 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() // ============================================================================ @@ -230,23 +299,25 @@ 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, + MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY, _T("wxToolBar Sample"), -#ifdef __WXWINCE__ - wxPoint(0, 0), wxDefaultSize, wxNO_BORDER -#else - wxPoint(100, 100), wxSize(550, 300) -#endif - ); + wxPoint(100, 100), wxSize(550, 300)); - frame->Show(TRUE); + frame->Show(true); - frame->SetStatusText(_T("Hello, wxWindows")); +#if wxUSE_STATUSBAR + frame->SetStatusText(_T("Hello, wxWidgets")); +#endif + + wxInitAllImageHandlers(); SetTopWindow(frame); - return TRUE; + return true; } void MyFrame::RecreateToolbar() @@ -254,91 +325,185 @@ 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 accomodate this usage in due course. + // 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); - style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL); - style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; - style |= wxNO_FULL_REPAINT_ON_RESIZE ; + 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); #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] = wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h)); } - - toolBar->SetToolBitmapSize(wxSize(w, h)); } - toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[0], _T("New file")); - toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[1], _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 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, _T(""), wxDefaultPosition, wxSize(200,-1) ); + 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")); + } +#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")); + + 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, _T("Print"), toolBarBitmaps[Tool_print], + 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.")); } -#endif // toolbars which don't support controls - toolBar->AddTool(wxID_SAVE, _T("Save"), toolBarBitmaps[2], _T("Toggle button 1"), wxITEM_CHECK); - toolBar->AddTool(wxID_COPY, _T("Copy"), toolBarBitmaps[3], _T("Toggle button 2"), wxITEM_CHECK); - toolBar->AddTool(wxID_CUT, _T("Cut"), toolBarBitmaps[4], _T("Toggle/Untoggle help button")); - toolBar->AddTool(wxID_PASTE, _T("Paste"), toolBarBitmaps[5], _T("Paste")); - toolBar->AddTool(wxID_PRINT, _T("Print"), toolBarBitmaps[6], _T("Delete this tool")); toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[7], _T("Help button"), wxITEM_CHECK); + 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); } // ---------------------------------------------------------------------------- @@ -355,14 +520,17 @@ MyFrame::MyFrame(wxFrame* parent, : wxFrame(parent, id, title, pos, size, style) { m_tbar = NULL; - m_textWindow = new wxTextCtrl(this, -1, _T(""), 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; -#ifndef __WXWINCE__ +#if wxUSE_STATUSBAR // Give it a status line CreateStatusBar(); #endif @@ -380,30 +548,61 @@ MyFrame::MyFrame(wxFrame* parent, _T("Toggle &another toolbar\tCtrl-A"), _T("Show/hide another test toolbar")); + tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, + _T("Toggle hori&zontal text\tCtrl-H"), + _T("Show text under/alongside the icon")); + 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")); - tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS, _T("Toggle number of &rows\tCtrl-R"), _T("Toggle number of toolbar rows between 1 and 2")); - tbarMenu->AppendSeparator(); + 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->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->AppendSeparator(); - tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T("")); + 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->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->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->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") ); @@ -415,30 +614,49 @@ MyFrame::MyFrame(wxFrame* parent, 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 SetMenuBar(menuBar); - 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(); -} -#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 + + 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); +} -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(); @@ -446,8 +664,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; } @@ -456,7 +673,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) @@ -487,6 +704,13 @@ void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event)) +{ + m_horzText = !m_horzText; + + RecreateToolbar(); +} + void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) { if ( m_tbar ) @@ -496,19 +720,20 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) } else { - long style = GetToolBar()->GetWindowStyle(); + long style = GetToolBar() ? GetToolBar()->GetWindowStyle() + : TOOLBAR_STYLE; style &= ~wxTB_HORIZONTAL; style |= wxTB_VERTICAL; - m_tbar = new wxToolBar(this, -1, + m_tbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, style); m_tbar->SetMargins(4, 4); - m_tbar->AddRadioTool(wxID_NEW, _T("First"), wxBITMAP(new)); - m_tbar->AddRadioTool(wxID_OPEN, _T("Second"), wxBITMAP(open)); - m_tbar->AddRadioTool(wxID_SAVE, _T("Third"), wxBITMAP(save)); + 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->AddSeparator(); m_tbar->AddTool(wxID_HELP, _T("Help"), wxBITMAP(help)); @@ -530,21 +755,48 @@ 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::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& event) @@ -554,7 +806,7 @@ void MyFrame::OnAbout(wxCommandEvent& event) else m_textWindow->WriteText( _T("Help button up now.\n") ); - (void)wxMessageBox(_T("wxWindows toolbar sample"), _T("About wxToolBar")); + (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar")); } void MyFrame::OnToolLeftClick(wxCommandEvent& event) @@ -579,6 +831,13 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event) } } +void MyFrame::OnToolRightClick(wxCommandEvent& event) +{ + m_textWindow->AppendText( + wxString::Format(_T("Tool %d right clicked.\n"), + (int) event.GetInt())); +} + void MyFrame::OnCombo(wxCommandEvent& event) { wxLogStatus(_T("Combobox string '%s' selected"), event.GetString().c_str()); @@ -610,10 +869,47 @@ void MyFrame::DoToggleHelp() 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) { - if (m_textWindow) - event.Enable( m_textWindow->CanCopy() ); + 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)) @@ -643,6 +939,28 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event) 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++; @@ -658,15 +976,20 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) tb->Realize(); } -void MyFrame::OnToolEnter(wxCommandEvent& event) +void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) { - if (event.GetSelection() > -1) + if ( m_tbar ) { - wxString str; - str.Printf(_T("This is tool number %d"), event.GetSelection()); - SetStatusText(str); + m_tbar->ToggleTool(IDM_TOOLBAR_OTHER_1 + + event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true); } - else - SetStatusText(_T("")); } +void MyFrame::OnToolDropdown(wxCommandEvent& event) +{ + wxString str; + str.Printf( _T("Dropdown on tool %d\n"), event.GetId()); + m_textWindow->WriteText( str ); + + event.Skip(); +}