X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc2ec626ea6114fdafb18da7752be495088b8832..bc429ce01f519f3edae182b516cb15b8d2df54a7:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index c13dc5050e..dd24065005 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -25,15 +25,13 @@ #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" // 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,15 +41,6 @@ #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 @@ -60,8 +49,11 @@ // 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" @@ -105,9 +97,12 @@ public: void OnToggleAnotherToolbar(wxCommandEvent& event); void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event)); + void OnBottomToolbar(wxCommandEvent& WXUNUSED(event)); void OnToggleToolbarSize(wxCommandEvent& event); void OnToggleToolbarOrient(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(); } @@ -117,8 +112,10 @@ 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 OnCombo(wxCommandEvent& event); @@ -128,12 +125,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(); @@ -143,7 +134,10 @@ private: bool m_smallToolbar, m_horzToolbar, - m_horzText; + m_bottomToolbar, + 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) @@ -153,6 +147,9 @@ private: wxToolBar *m_tbar; + // the path to the custom bitmap for the test toolbar tool + wxString m_pathBmp; + DECLARE_EVENT_TABLE() }; @@ -169,6 +166,8 @@ enum IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, IDM_TOOLBAR_TOGGLETOOLBARORIENT, IDM_TOOLBAR_TOGGLETOOLBARROWS, + IDM_TOOLBAR_TOGGLETOOLTIPS, + IDM_TOOLBAR_TOGGLECUSTOMDISABLED, IDM_TOOLBAR_ENABLEPRINT, IDM_TOOLBAR_DELETEPRINT, IDM_TOOLBAR_INSERTPRINT, @@ -183,12 +182,14 @@ enum IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_ICONS, IDM_TOOLBAR_SHOW_BOTH, - + IDM_TOOLBAR_CUSTOM_PATH, + IDM_TOOLBAR_BOTTOM_ORIENTATION, IDM_TOOLBAR_OTHER_1, IDM_TOOLBAR_OTHER_2, IDM_TOOLBAR_OTHER_3, - ID_COMBO = 1000 + ID_COMBO = 1000, + ID_SPIN = 1001 }; // ---------------------------------------------------------------------------- @@ -208,9 +209,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, MyFrame::OnToggleAnotherToolbar) EVT_MENU(IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, MyFrame::OnToggleHorizontalText) + EVT_MENU(IDM_TOOLBAR_BOTTOM_ORIENTATION, MyFrame::OnBottomToolbar) 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) @@ -223,11 +227,14 @@ 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_UPDATE_UI(wxID_COPY, MyFrame::OnUpdateCopyAndCut) EVT_UPDATE_UI(wxID_CUT, MyFrame::OnUpdateCopyAndCut) @@ -256,19 +263,16 @@ bool MyApp::OnInit() // 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); -#ifndef __SMARTPHONE__ +#if wxUSE_STATUSBAR frame->SetStatusText(_T("Hello, wxWidgets")); #endif + wxInitAllImageHandlers(); + SetTopWindow(frame); return true; @@ -279,7 +283,7 @@ 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 @@ -290,9 +294,17 @@ void MyFrame::RecreateToolbar() SetToolBar(NULL); - style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT); + style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_HORZ_LAYOUT); + if( m_bottomToolbar ) + style |= wxTB_BOTTOM; + else style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; + 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; @@ -300,66 +312,119 @@ void MyFrame::RecreateToolbar() #endif // 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], _T("New file")); + toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file")); // 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 ) { - wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), wxDefaultPosition, wxSize(200,wxDefaultSize.y) ); + wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(200,wxDefaultCoord) ); 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); + + //wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 100, 0 ); + //toolBar->AddControl( spin ); } #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. This is a very long tooltip to test whether it does the right thing when the tooltip is more than Windows can cope with.")); + 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.")); + } + 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 @@ -385,11 +450,15 @@ MyFrame::MyFrame(wxFrame* parent, m_smallToolbar = true; m_horzToolbar = true; + m_bottomToolbar = false; m_horzText = false; + m_useCustomDisabled = false; + m_showTooltips = true; + m_rows = 1; m_nPrint = 1; -#ifndef __SMARTPHONE__ +#if wxUSE_STATUSBAR // Give it a status line CreateStatusBar(); #endif @@ -423,22 +492,36 @@ MyFrame::MyFrame(wxFrame* parent, _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->AppendCheckItem(IDM_TOOLBAR_BOTTOM_ORIENTATION, + _T("Set toolbar at the bottom of the window"), + _T("Set toolbar at the bottom 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") ); @@ -456,11 +539,12 @@ MyFrame::MyFrame(wxFrame* parent, SetMenuBar(menuBar); menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true); + menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true); // Create the toolbar RecreateToolbar(); - m_textWindow = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE); + m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE); } #if USE_GENERIC_TBAR @@ -483,8 +567,7 @@ void MyFrame::LayoutChildren() int offset; if ( m_tbar ) { - m_tbar->SetSize(wxDefaultSize.x, size.y); - m_tbar->Move(0, 0); + m_tbar->SetSize(0, 0, wxDefaultCoord, size.y); offset = m_tbar->GetSize().x; } @@ -540,7 +623,8 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) } else { - long style = GetToolBar()->GetWindowStyle(); + long style = GetToolBar() ? GetToolBar()->GetWindowStyle() + : TOOLBAR_STYLE; style &= ~wxTB_HORIZONTAL; style |= wxTB_VERTICAL; @@ -579,9 +663,28 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event)) //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; + + RecreateToolbar(); +} + void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) { + if( m_bottomToolbar ) + m_bottomToolbar = false; m_horzToolbar = !m_horzToolbar; + wxMenuBar *menuBar = GetMenuBar(); + if( menuBar->IsChecked( IDM_TOOLBAR_BOTTOM_ORIENTATION ) ) + menuBar->Check( IDM_TOOLBAR_BOTTOM_ORIENTATION, false ); RecreateToolbar(); } @@ -623,6 +726,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()); @@ -694,6 +804,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++; @@ -711,7 +828,7 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToolEnter(wxCommandEvent& event) { -#ifndef __SMARTPHONE__ +#if wxUSE_STATUSBAR if (event.GetSelection() > -1) { wxString str; @@ -719,8 +836,10 @@ void MyFrame::OnToolEnter(wxCommandEvent& event) SetStatusText(str); } else - SetStatusText(_T("")); -#endif + SetStatusText(wxEmptyString); +#else + wxUnusedVar(event); +#endif // wxUSE_STATUSBAR } void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) @@ -731,4 +850,13 @@ void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true); } } - +void MyFrame::OnBottomToolbar(wxCommandEvent& WXUNUSED(event) ) +{ + m_bottomToolbar = !m_bottomToolbar; + wxMenuBar *menuBar = GetMenuBar(); + if( menuBar->IsChecked( IDM_TOOLBAR_TOGGLETOOLBARORIENT ) ) + menuBar->Check( IDM_TOOLBAR_TOGGLETOOLBARORIENT, false ); + if( !m_horzToolbar ) + m_horzToolbar = true; + RecreateToolbar(); +}