X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b20edf8b33e4ffa3a56e65f773e3bf73e13adf81..746b24a09de738d5263284c3feb9cc4f855b23d6:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index e7a02de316..e8edd69298 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -31,9 +31,7 @@ #include "wx/toolbar.h" #include "wx/log.h" #include "wx/image.h" - -// define this to 1 to use wxToolBarSimple instead of the native one -#define USE_GENERIC_TBAR 0 +#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 "wx/tbarsmpl.h" - #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 @@ -111,6 +100,7 @@ public: 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(); } @@ -121,6 +111,7 @@ public: void OnToggleRadioBtn(wxCommandEvent& event); void OnToolbarStyle(wxCommandEvent& event); + void OnToolbarCustomBitmap(wxCommandEvent& event); void OnToolLeftClick(wxCommandEvent& event); void OnToolRightClick(wxCommandEvent& event); @@ -133,12 +124,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(); @@ -149,7 +134,8 @@ private: bool m_smallToolbar, m_horzToolbar, m_horzText, - m_useCustomDisabled; + m_useCustomDisabled, + m_showTooltips; size_t m_rows; // 1 or 2 only // the number of print buttons we have (they're added/removed dynamically) @@ -159,6 +145,9 @@ private: wxToolBar *m_tbar; + // the path to the custom bitmap for the test toolbar tool + wxString m_pathBmp; + DECLARE_EVENT_TABLE() }; @@ -175,6 +164,7 @@ enum IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, IDM_TOOLBAR_TOGGLETOOLBARORIENT, IDM_TOOLBAR_TOGGLETOOLBARROWS, + IDM_TOOLBAR_TOGGLETOOLTIPS, IDM_TOOLBAR_TOGGLECUSTOMDISABLED, IDM_TOOLBAR_ENABLEPRINT, IDM_TOOLBAR_DELETEPRINT, @@ -190,6 +180,7 @@ enum IDM_TOOLBAR_SHOW_TEXT, IDM_TOOLBAR_SHOW_ICONS, IDM_TOOLBAR_SHOW_BOTH, + IDM_TOOLBAR_CUSTOM_PATH, IDM_TOOLBAR_OTHER_1, IDM_TOOLBAR_OTHER_2, @@ -218,6 +209,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) @@ -231,6 +223,8 @@ 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) @@ -265,12 +259,7 @@ 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); @@ -278,6 +267,8 @@ bool MyApp::OnInit() frame->SetStatusText(_T("Hello, wxWidgets")); #endif + wxInitAllImageHandlers(); + SetTopWindow(frame); return true; @@ -302,6 +293,11 @@ void MyFrame::RecreateToolbar() style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT); 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; @@ -354,15 +350,15 @@ void MyFrame::RecreateToolbar() toolBarBitmaps[n] = wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h)); } - - toolBar->SetToolBitmapSize(wxSize(w, h)); } + toolBar->SetToolBitmapSize(wxSize(w, h)); + toolBar->AddTool(wxID_NEW, _T("New"), toolBarBitmaps[Tool_new], _T("New file")); toolBar->AddTool(wxID_OPEN, _T("Open"), toolBarBitmaps[Tool_open], _T("Open file")); // 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 ) { @@ -406,6 +402,20 @@ void MyFrame::RecreateToolbar() toolBar->AddSeparator(); toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[Tool_help], _T("Help button"), wxITEM_CHECK); + if ( !m_pathBmp.empty() ) + { + // create a tool with a custom bitmap for testing + wxImage img(m_pathBmp); + if ( img.Ok() ) + { + if ( img.GetWidth() > w && img.GetHeight() > h ) + img = img.GetSubImage(wxRect(0, 0, w, h)); + + toolBar->AddSeparator(); + toolBar->AddTool(wxID_ANY, _T("Custom"), img); + } + } + // after adding the buttons to the toolbar, must call Realize() to reflect // the changes toolBar->Realize(); @@ -432,6 +442,8 @@ MyFrame::MyFrame(wxFrame* parent, m_horzToolbar = true; m_horzText = false; m_useCustomDisabled = false; + m_showTooltips = true; + m_rows = 1; m_nPrint = 1; @@ -469,6 +481,10 @@ 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")); @@ -476,20 +492,22 @@ MyFrame::MyFrame(wxFrame* parent, tbarMenu->AppendSeparator(); - tbarMenu->Append(IDM_TOOLBAR_ENABLEPRINT, _T("&Enable print button\tCtrl-E"), wxEmptyString); - tbarMenu->Append(IDM_TOOLBAR_DELETEPRINT, _T("&Delete print button\tCtrl-D"), wxEmptyString); - tbarMenu->Append(IDM_TOOLBAR_INSERTPRINT, _T("&Insert print button\tCtrl-I"), wxEmptyString); - tbarMenu->Append(IDM_TOOLBAR_TOGGLEHELP, _T("Toggle &help button\tCtrl-T"), wxEmptyString); + 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"), wxEmptyString); - tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN2, _T("Toggle &2nd radio button\tCtrl-2"), wxEmptyString); - tbarMenu->Append(IDM_TOOLBAR_TOGGLERADIOBTN3, _T("Toggle &3rd radio button\tCtrl-3"), wxEmptyString); + tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip")); tbarMenu->AppendSeparator(); - tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), wxEmptyString); + 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") ); @@ -507,6 +525,7 @@ MyFrame::MyFrame(wxFrame* parent, SetMenuBar(menuBar); menuBar->Check(IDM_TOOLBAR_SHOW_BOTH, true); + menuBar->Check(IDM_TOOLBAR_TOGGLETOOLTIPS, true); // Create the toolbar RecreateToolbar(); @@ -514,19 +533,6 @@ MyFrame::MyFrame(wxFrame* parent, m_textWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE); } -#if USE_GENERIC_TBAR - -wxToolBar* MyFrame::OnCreateToolBar(long style, - wxWindowID id, - const wxString& name) -{ - return (wxToolBar *)new wxToolBarSimple(this, id, - wxDefaultPosition, wxDefaultSize, - style, name); -} - -#endif // USE_GENERIC_TBAR - void MyFrame::LayoutChildren() { wxSize size = GetClientSize(); @@ -630,6 +636,13 @@ 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; @@ -759,6 +772,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++;