X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fc6bbc6dad24c086af8ed1caea39dc3d4482eb95..67d947ba89b176c05c7707f44e4381bdef0f21c8:/samples/toolbar/toolbar.cpp?ds=sidebyside diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 623e503e5c..77e6ad964b 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop @@ -30,34 +30,57 @@ #include #include +#include +#include + +// define this to 1 to use wxToolBarSimple instead of the native one +#define USE_GENERIC_TBAR 0 + +// define this to use XPMs everywhere (by default, BMPs are used under Win) +#ifdef __WXMSW__ + #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 // ---------------------------------------------------------------------------- // resources // ---------------------------------------------------------------------------- -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if USE_XPM_BITMAPS #include "mondrian.xpm" #include "bitmaps/new.xpm" #include "bitmaps/open.xpm" #include "bitmaps/save.xpm" #include "bitmaps/copy.xpm" #include "bitmaps/cut.xpm" - // #include "bitmaps/paste.xpm" + #include "bitmaps/preview.xpm" // paste XPM #include "bitmaps/print.xpm" - #include "bitmaps/preview.xpm" #include "bitmaps/help.xpm" -#endif // GTK or Motif +#endif // USE_XPM_BITMAPS // ---------------------------------------------------------------------------- // classes // ---------------------------------------------------------------------------- // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { public: bool OnInit(); - bool InitToolbar(wxToolBar* toolBar, bool smallicons = FALSE); }; // Define a new frame @@ -71,27 +94,54 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE); + void RecreateToolbar(); + void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); - void OnToggleToolbar(wxCommandEvent& event); - void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); } - void OnDeletePrint(wxCommandEvent& event) { DoDeletePrint(); } + void OnSize(wxSizeEvent& event); + + void OnToggleAnotherToolbar(wxCommandEvent& event); + + void OnToggleToolbarSize(wxCommandEvent& event); + void OnToggleToolbarOrient(wxCommandEvent& event); + void OnToggleToolbarRows(wxCommandEvent& event); + + void OnEnablePrint(wxCommandEvent& WXUNUSED(event)) { DoEnablePrint(); } + void OnDeletePrint(wxCommandEvent& WXUNUSED(event)) { DoDeletePrint(); } void OnInsertPrint(wxCommandEvent& event); - void OnToggleHelp(wxCommandEvent& event) { DoToggleHelp(); } + void OnChangeToolTip(wxCommandEvent& event); + void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); } + + void OnToolbarStyle(wxCommandEvent& event); void OnToolLeftClick(wxCommandEvent& event); void OnToolEnter(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 + private: void DoEnablePrint(); void DoDeletePrint(); void DoToggleHelp(); - bool m_smallToolbar; - wxTextCtrl* m_textWindow; + void LayoutChildren(); + + bool m_smallToolbar, + m_horzToolbar; + size_t m_rows; // 1 or 2 only + + wxTextCtrl *m_textWindow; + + wxToolBar *m_tbar; DECLARE_EVENT_TABLE() }; @@ -102,13 +152,23 @@ private: const int ID_TOOLBAR = 500; +static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT ; +// static const long TOOLBAR_STYLE = 0; + enum { - IDM_TOOLBAR_TOGGLETOOLBAR = 200, + IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, + IDM_TOOLBAR_TOGGLETOOLBARORIENT, + IDM_TOOLBAR_TOGGLETOOLBARROWS, IDM_TOOLBAR_ENABLEPRINT, IDM_TOOLBAR_DELETEPRINT, IDM_TOOLBAR_INSERTPRINT, IDM_TOOLBAR_TOGGLEHELP, + IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, + IDM_TOOLBAR_CHANGE_TOOLTIP, + IDM_TOOLBAR_SHOW_TEXT, + IDM_TOOLBAR_SHOW_ICONS, + IDM_TOOLBAR_SHOW_BOTH, ID_COMBO = 1000 }; @@ -121,20 +181,34 @@ enum // help button. BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_SIZE(MyFrame::OnSize) + EVT_MENU(wxID_EXIT, MyFrame::OnQuit) EVT_MENU(wxID_HELP, MyFrame::OnAbout) - EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBAR, MyFrame::OnToggleToolbar) + EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar) + + 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_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_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip) + + EVT_MENU_RANGE(IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_BOTH, + MyFrame::OnToolbarStyle) EVT_MENU(-1, MyFrame::OnToolLeftClick) EVT_COMBOBOX(ID_COMBO, MyFrame::OnCombo) EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter) + + EVT_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut) + EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut) END_EVENT_TABLE() // ============================================================================ @@ -154,15 +228,7 @@ bool MyApp::OnInit() // Create the main frame window MyFrame* frame = new MyFrame((wxFrame *) NULL, -1, "wxToolBar Sample", - wxPoint(100, 100), wxSize(450, 300)); - - // VZ: what's this for?? -#if 0 - // Force a resize. This should probably be replaced by a call to a wxFrame - // function that lays out default decorations and the remaining content window. - wxSizeEvent event(wxSize(-1, -1), frame->GetId()); - frame->OnSize(event); -#endif // 0 + wxPoint(100, 100), wxSize(550, 300)); frame->Show(TRUE); @@ -173,81 +239,89 @@ bool MyApp::OnInit() return TRUE; } -bool MyApp::InitToolbar(wxToolBar* toolBar, bool smallicons) +void MyFrame::RecreateToolbar() { - // Set up toolbar - wxBitmap* toolBarBitmaps[8]; + // delete and recreate the toolbar + wxToolBarBase *toolBar = GetToolBar(); + long style = toolBar ? toolBar->GetWindowStyle() : TOOLBAR_STYLE; -#ifdef __WXMSW__ - toolBarBitmaps[0] = new wxBitmap("icon1"); - toolBarBitmaps[1] = new wxBitmap("icon2"); - if ( !smallicons ) - { - toolBarBitmaps[2] = new wxBitmap("icon3"); - toolBarBitmaps[3] = new wxBitmap("icon4"); - toolBarBitmaps[4] = new wxBitmap("icon5"); - toolBarBitmaps[5] = new wxBitmap("icon6"); - toolBarBitmaps[6] = new wxBitmap("icon7"); - toolBarBitmaps[7] = new wxBitmap("icon8"); - } -#else - toolBarBitmaps[0] = new wxBitmap( new_xpm ); - toolBarBitmaps[1] = new wxBitmap( open_xpm ); - if ( !smallicons ) - { - toolBarBitmaps[2] = new wxBitmap( save_xpm ); - toolBarBitmaps[3] = new wxBitmap( copy_xpm ); - toolBarBitmaps[4] = new wxBitmap( cut_xpm ); - toolBarBitmaps[5] = new wxBitmap( preview_xpm ); - toolBarBitmaps[6] = new wxBitmap( print_xpm ); - toolBarBitmaps[7] = new wxBitmap( help_xpm ); - } -#endif + delete toolBar; -#ifdef __WXMSW__ - int width = 24; -#else - int width = 16; -#endif - int currentX = 5; - - 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"); - - wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO); - combo->Append("This"); - combo->Append("is a"); - combo->Append("combobox"); - combo->Append("in a"); - combo->Append("toolbar"); - toolBar->AddControl(combo); - - if ( !smallicons ) - { - 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; - toolBar->AddSeparator(); - toolBar->AddTool(wxID_HELP, *(toolBarBitmaps[7]), wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help button"); - } - - toolBar->Realize(); - - // Can delete the bitmaps since they're reference counted - int i, max = smallicons ? 2 : WXSIZEOF(toolBarBitmaps); - for (i = 0; i < max; i++) - delete toolBarBitmaps[i]; - - return TRUE; + SetToolBar(NULL); + + style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL); + style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; + + toolBar = CreateToolBar(style, ID_TOOLBAR); + //toolBar->SetMargins( 4, 4 ); + + // Set up toolbar + wxBitmap toolBarBitmaps[8]; + +#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); +#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); +#endif // USE_XPM_BITMAPS/!USE_XPM_BITMAPS + + if ( !m_smallToolbar ) + { + int w = 2*toolBarBitmaps[0].GetWidth(), + h = 2*toolBarBitmaps[0].GetHeight(); + for ( size_t n = 0; 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")); + + // neither the generic nor Motif native toolbars really support this +#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) && !defined(__WXX11__) + // adding a combo to a vertical toolbar is not very smart + if ( m_horzToolbar ) + { + 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"); + toolBar->AddControl(combo); + } +#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); + + // 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); } // ---------------------------------------------------------------------------- @@ -263,8 +337,12 @@ MyFrame::MyFrame(wxFrame* parent, long style) : 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 = FALSE; + + m_smallToolbar = TRUE; + m_horzToolbar = TRUE; + m_rows = 1; // Give it a status line CreateStatusBar(); @@ -274,14 +352,39 @@ MyFrame::MyFrame(wxFrame* parent, // Make a menubar wxMenu *tbarMenu = new wxMenu; - tbarMenu->Append(IDM_TOOLBAR_TOGGLETOOLBAR, "&Toggle toolbar\tCtrl-T", "Change the toolbar kind"); + 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->AppendSeparator(); + 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->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, "Change tool tip", ""); + tbarMenu->AppendSeparator(); + tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_TEXT, "Show &text\tAlt-T"); + tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_ICONS, "Show &icons\tAlt-I"); + tbarMenu->AppendRadioItem(IDM_TOOLBAR_SHOW_BOTH, "Show &both\tAlt-B"); wxMenu *fileMenu = new wxMenu; - fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" ); + fileMenu->Append(wxID_EXIT, "E&xit\tAlt-X", "Quit toolbar sample" ); wxMenu *helpMenu = new wxMenu; helpMenu->Append(wxID_HELP, "&About", "About toolbar sample"); @@ -295,29 +398,108 @@ MyFrame::MyFrame(wxFrame* parent, // Associate the menu bar with the frame SetMenuBar(menuBar); + menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, TRUE); + // Create the toolbar - wxToolBar *tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | - wxTB_FLAT | wxTB_DOCKABLE, - ID_TOOLBAR); + RecreateToolbar(); +} - tbar->SetMargins( 4, 4 ); +#if USE_GENERIC_TBAR - wxGetApp().InitToolbar(tbar); +wxToolBar* MyFrame::OnCreateToolBar(long style, + wxWindowID id, + const wxString& name) +{ + return (wxToolBar *)new wxToolBarSimple(this, id, + wxDefaultPosition, wxDefaultSize, + style, name); } -void MyFrame::OnToggleToolbar(wxCommandEvent& WXUNUSED(event)) +#endif // USE_GENERIC_TBAR + +void MyFrame::LayoutChildren() { - // delete and recreate the toolbar - wxToolBar *tbar = GetToolBar(); - delete tbar; + wxSize size = GetClientSize(); - SetToolBar(NULL); - tbar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | - wxTB_FLAT | wxTB_DOCKABLE, - ID_TOOLBAR); + int offset; + if ( m_tbar ) + { + m_tbar->SetSize(-1, size.y); + m_tbar->Move(0, 0); + + offset = m_tbar->GetSize().x; + } + else + { + offset = 0; + } + m_textWindow->SetSize(offset, 0, size.x - offset, size.y); +} + +void MyFrame::OnSize(wxSizeEvent& event) +{ + if ( m_tbar ) + { + LayoutChildren(); + } + else + { + event.Skip(); + } +} + +void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) +{ + if ( m_tbar ) + { + delete m_tbar; + m_tbar = NULL; + } + else + { + long style = GetToolBar()->GetWindowStyle(); + style &= ~wxTB_HORIZONTAL; + style |= wxTB_VERTICAL; + + m_tbar = new wxToolBar(this, -1, + wxDefaultPosition, wxDefaultSize, + style); + + 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->AddSeparator(); + m_tbar->AddTool(wxID_HELP, _T("Help"), wxBITMAP(help)); + + m_tbar->Realize(); + } + + LayoutChildren(); +} + +void MyFrame::OnToggleToolbarSize(wxCommandEvent& WXUNUSED(event)) +{ m_smallToolbar = !m_smallToolbar; - wxGetApp().InitToolbar(tbar, m_smallToolbar); + + RecreateToolbar(); +} + +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); + + //RecreateToolbar(); -- this is unneeded +} + +void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) +{ + m_horzToolbar = !m_horzToolbar; + + RecreateToolbar(); } void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) @@ -367,7 +549,7 @@ void MyFrame::OnCombo(wxCommandEvent& event) void MyFrame::DoEnablePrint() { - wxToolBar *tb = GetToolBar(); + wxToolBarBase *tb = GetToolBar(); if (tb->GetToolEnabled(wxID_PRINT)) tb->EnableTool( wxID_PRINT, FALSE ); else @@ -376,40 +558,70 @@ void MyFrame::DoEnablePrint() void MyFrame::DoDeletePrint() { - wxToolBar *tb = GetToolBar(); + wxToolBarBase *tb = GetToolBar(); tb->DeleteTool( wxID_PRINT ); } void MyFrame::DoToggleHelp() { - wxToolBar *tb = GetToolBar(); + wxToolBarBase *tb = GetToolBar(); tb->ToggleTool( wxID_HELP, !tb->GetToolState( wxID_HELP ) ); } +void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event) +{ + event.Enable( m_textWindow->CanCopy() ); +} + +void MyFrame::OnChangeToolTip(wxCommandEvent& WXUNUSED(event)) +{ + GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button")); +} + +void MyFrame::OnToolbarStyle(wxCommandEvent& event) +{ + long style = GetToolBar()->GetWindowStyle(); + style &= ~(wxTB_NOICONS | wxTB_TEXT); + + switch ( event.GetId() ) + { + case IDM_TOOLBAR_SHOW_TEXT: + style |= wxTB_NOICONS | wxTB_TEXT; + break; + + case IDM_TOOLBAR_SHOW_ICONS: + // nothing to do + break; + + case IDM_TOOLBAR_SHOW_BOTH: + style |= wxTB_TEXT; + } + + GetToolBar()->SetWindowStyle(style); +} + void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) { -#ifdef __WXMSW__ - wxBitmap bmp("icon7"); -#else - wxBitmap bmp(print_xpm); -#endif + wxBitmap bmp = wxBITMAP(print); GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap, - FALSE, (wxObject *) NULL, "Delete this tool"); + FALSE, (wxObject *) NULL, + "Delete this tool", + "This button was inserted into the toolbar"); GetToolBar()->Realize(); } void MyFrame::OnToolEnter(wxCommandEvent& event) { - if (event.GetSelection() > -1) - { - wxString str; - str.Printf(_T("This is tool number %d"), event.GetSelection()); - SetStatusText(str); - } - else - SetStatusText(""); + if (event.GetSelection() > -1) + { + wxString str; + str.Printf(_T("This is tool number %d"), event.GetSelection()); + SetStatusText(str); + } + else + SetStatusText(""); }