X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef3e6c15f26d2e92e0a9ceddc04ce0a20ca34638..02fd8b9b6186623ed61019ac7e69ed9a4ef16773:/samples/toolbar/toolbar.cpp?ds=sidebyside diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 829d602086..c1c95e469b 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -32,7 +32,7 @@ #include "wx/log.h" #include "wx/image.h" #include "wx/filedlg.h" -#include "wx/spinctrl.h" +#include "wx/colordlg.h" #include "wx/srchctrl.h" // define this to use XPMs everywhere (by default, BMPs are used under Win) @@ -53,6 +53,9 @@ // 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 // ---------------------------------------------------------------------------- @@ -84,36 +87,6 @@ enum Positions // classes // ---------------------------------------------------------------------------- -class MyMiniControl: public wxControl -{ -public: - MyMiniControl( wxWindow *parent ) : - wxControl( parent, -1, wxDefaultPosition, wxSize(70,22), wxBORDER_SUNKEN, wxDefaultValidator, "MyMiniControl" ) - { - } - void OnPaint(wxPaintEvent &WXUNUSED(event)) - { - wxPaintDC dc(this); - dc.SetPen( *wxWHITE_PEN ); - dc.SetBrush( *wxGREEN_BRUSH ); - wxSize size = GetClientSize(); - dc.DrawRectangle( 0,0,size.x,size.y ); - } - virtual wxSize GetBestSize() - { - return wxSize(70,22); - } - -private: - DECLARE_EVENT_TABLE() -}; - -BEGIN_EVENT_TABLE(MyMiniControl, wxControl) - EVT_PAINT(MyMiniControl::OnPaint) -END_EVENT_TABLE() - - - // Define a new application class MyApp : public wxApp { @@ -131,6 +104,7 @@ public: 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(); @@ -155,9 +129,11 @@ public: 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); @@ -193,13 +169,18 @@ private: 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() }; @@ -213,24 +194,18 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; enum { - IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, + // 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_ENABLEPRINT, - IDM_TOOLBAR_DELETEPRINT, - IDM_TOOLBAR_INSERTPRINT, - IDM_TOOLBAR_TOGGLEHELP, - IDM_TOOLBAR_TOGGLERADIOBTN1, - IDM_TOOLBAR_TOGGLERADIOBTN2, - IDM_TOOLBAR_TOGGLERADIOBTN3, - IDM_TOOLBAR_TOGGLE_TOOLBAR, - IDM_TOOLBAR_TOGGLE_HORIZONTAL_TEXT, - IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, - IDM_TOOLBAR_CHANGE_TOOLTIP, 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, @@ -240,8 +215,18 @@ enum IDM_TOOLBAR_OTHER_2, IDM_TOOLBAR_OTHER_3, - ID_COMBO = 1000, - ID_SPIN = 1001 + // tools menu items + IDM_TOOLBAR_ENABLEPRINT, + IDM_TOOLBAR_DELETEPRINT, + IDM_TOOLBAR_INSERTPRINT, + IDM_TOOLBAR_TOGGLEHELP, + IDM_TOOLBAR_TOGGLESEARCH, + IDM_TOOLBAR_TOGGLERADIOBTN1, + IDM_TOOLBAR_TOGGLERADIOBTN2, + IDM_TOOLBAR_TOGGLERADIOBTN3, + IDM_TOOLBAR_CHANGE_TOOLTIP, + + ID_COMBO = 1000 }; // ---------------------------------------------------------------------------- @@ -271,12 +256,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) @@ -345,6 +332,13 @@ void MyFrame::RecreateToolbar() 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); @@ -447,10 +441,9 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) 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 && !defined(__WXX11__) || defined(__WXUNIVERSAL__) +#if USE_CONTROLS_IN_TOOLBAR // adding a combo to a vertical toolbar is not very smart - if ( !( toolBar->IsVertical() ) ) + if ( !toolBar->IsVertical() ) { wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, wxEmptyString, wxDefaultPosition, wxSize(100,-1) ); combo->Append(_T("This")); @@ -459,19 +452,8 @@ void MyFrame::PopulateToolbar(wxToolBarBase* toolBar) combo->Append(_T("in a")); combo->Append(_T("toolbar")); toolBar->AddControl(combo, _T("Combo Label")); - - wxSpinCtrl *spin = new wxSpinCtrl( toolBar, ID_SPIN, wxT("0"), wxDefaultPosition, wxSize(80,wxDefaultCoord), 0, 0, 100 ); - toolBar->AddControl( spin ); - - wxTextCtrl *text = new wxTextCtrl( toolBar, -1, wxT("text"), wxDefaultPosition, wxSize(80,wxDefaultCoord) ); - toolBar->AddControl( text ); - - wxSearchCtrl *srch = new wxSearchCtrl( toolBar, -1, wxT("xx"), wxDefaultPosition, wxSize(80,wxDefaultCoord), wxSUNKEN_BORDER ); - toolBar->AddControl( srch ); - - toolBar->AddControl( new MyMiniControl( toolBar) ); } -#endif // toolbars which don't support controls +#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); @@ -543,6 +525,7 @@ MyFrame::MyFrame(wxFrame* parent, m_horzText = false; m_useCustomDisabled = false; m_showTooltips = true; + m_searchTool = NULL; m_rows = 1; m_nPrint = 1; @@ -601,23 +584,26 @@ MyFrame::MyFrame(wxFrame* parent, _T("Set toolbar at the right edge of the window")); tbarMenu->AppendSeparator(); - 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_CHANGE_TOOLTIP, _T("Change tool tip")); - tbarMenu->AppendSeparator(); 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") ); @@ -628,6 +614,7 @@ 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 @@ -646,19 +633,30 @@ MyFrame::MyFrame(wxFrame* parent, #if USE_UNMANAGED_TOOLBAR m_extraToolBar = new wxToolBar(m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_TEXT|wxTB_FLAT|wxTB_TOP); PopulateToolbar(m_extraToolBar); -#else - m_extraToolBar = NULL; #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); } +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() { wxSize size = GetClientSize(); @@ -871,6 +869,36 @@ 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) { event.Enable( m_textWindow->CanCopy() ); @@ -911,6 +939,21 @@ 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"));