X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd46ee66e56b6d05cbf441dc59d1df3fe955e2b7..c4e2838090992384911a6a6aa44cac985d79a555:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 9eea80a9d9..747a49f142 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -88,11 +88,11 @@ class MyFrame: public wxFrame { public: MyFrame(wxFrame *parent, - wxWindowID id = -1, - const wxString& title = "wxToolBar Sample", + wxWindowID id = wxID_ANY, + const wxString& title = _T("wxToolBar Sample"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE); + long style = wxDEFAULT_FRAME_STYLE|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE); void RecreateToolbar(); @@ -103,6 +103,7 @@ public: void OnToggleToolbar(wxCommandEvent& event); void OnToggleAnotherToolbar(wxCommandEvent& event); + void OnToggleHorizontalText(wxCommandEvent& WXUNUSED(event)); void OnToggleToolbarSize(wxCommandEvent& event); void OnToggleToolbarOrient(wxCommandEvent& event); @@ -113,15 +114,20 @@ public: void OnInsertPrint(wxCommandEvent& event); void OnChangeToolTip(wxCommandEvent& event); void OnToggleHelp(wxCommandEvent& WXUNUSED(event)) { DoToggleHelp(); } + void OnToggleRadioBtn(wxCommandEvent& event); void OnToolbarStyle(wxCommandEvent& event); void OnToolLeftClick(wxCommandEvent& event); + void OnToolRightClick(wxCommandEvent& event); void OnToolEnter(wxCommandEvent& event); void OnCombo(wxCommandEvent& event); void OnUpdateCopyAndCut(wxUpdateUIEvent& event); + void OnUpdateToggleHorzText(wxUpdateUIEvent& event); + void OnUpdateToggleRadioBtn(wxUpdateUIEvent& event) + { event.Enable( m_tbar != NULL ); } #if USE_GENERIC_TBAR virtual wxToolBar *OnCreateToolBar(long style, @@ -137,9 +143,13 @@ private: void LayoutChildren(); bool m_smallToolbar, - m_horzToolbar; + m_horzToolbar, + m_horzText; size_t m_rows; // 1 or 2 only + // the number of print buttons we have (they're added/removed dynamically) + size_t m_nPrint; + wxTextCtrl *m_textWindow; wxToolBar *m_tbar; @@ -164,13 +174,21 @@ enum 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_OTHER_1, + IDM_TOOLBAR_OTHER_2, + IDM_TOOLBAR_OTHER_3, + ID_COMBO = 1000 }; @@ -189,6 +207,7 @@ 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(IDM_TOOLBAR_TOGGLETOOLBARSIZE, MyFrame::OnToggleToolbarSize) EVT_MENU(IDM_TOOLBAR_TOGGLETOOLBARORIENT, MyFrame::OnToggleToolbarOrient) @@ -198,19 +217,28 @@ 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_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(-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_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() // ============================================================================ @@ -228,21 +256,34 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main frame window - MyFrame* frame = new MyFrame((wxFrame *) NULL, -1, - "wxToolBar Sample", - wxPoint(100, 100), wxSize(550, 300)); + MyFrame* frame = new MyFrame((wxFrame *) NULL, wxID_ANY, + _T("wxToolBar Sample"), +#ifdef __WXWINCE__ + wxDefaultPosition, wxDefaultSize +#else + wxPoint(100, 100), wxSize(550, 300) +#endif + ); - frame->Show(TRUE); + frame->Show(true); - frame->SetStatusText("Hello, wxWindows"); +#if wxUSE_STATUSBAR + frame->SetStatusText(_T("Hello, wxWidgets")); +#endif SetTopWindow(frame); - return TRUE; + return true; } 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 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; @@ -251,10 +292,14 @@ void MyFrame::RecreateToolbar() SetToolBar(NULL); - style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL); + style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_HORZ_LAYOUT); style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; + if ( style & wxTB_TEXT && !(style & wxTB_NOICONS) && m_horzText ) + style |= wxTB_HORZ_LAYOUT; + toolBar = CreateToolBar(style, ID_TOOLBAR); +#endif // Set up toolbar wxBitmap toolBarBitmaps[8]; @@ -295,17 +340,17 @@ void MyFrame::RecreateToolbar() 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__) + // the generic toolbar doesn't really support this +#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !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, "", wxDefaultPosition, wxSize(200,-1) ); - combo->Append("This"); - combo->Append("is a"); - combo->Append("combobox"); - combo->Append("in a"); - combo->Append("toolbar"); + wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO, _T(""), 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); } #endif // toolbars which don't support controls @@ -314,7 +359,7 @@ void MyFrame::RecreateToolbar() 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->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->AddSeparator(); toolBar->AddTool(wxID_HELP, _T("Help"), toolBarBitmaps[7], _T("Help button"), wxITEM_CHECK); @@ -339,14 +384,17 @@ MyFrame::MyFrame(wxFrame* parent, : 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 = TRUE; - m_horzToolbar = TRUE; + m_smallToolbar = true; + m_horzToolbar = true; + m_horzText = false; m_rows = 1; + m_nPrint = 1; +#if wxUSE_STATUSBAR // Give it a status line CreateStatusBar(); +#endif // Give it an icon SetIcon(wxICON(mondrian)); @@ -354,57 +402,67 @@ MyFrame::MyFrame(wxFrame* parent, // Make a menubar wxMenu *tbarMenu = new wxMenu; tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_TOOLBAR, - "Toggle &toolbar\tCtrl-Z", - "Show or hide the toolbar"); + _T("Toggle &toolbar\tCtrl-Z"), + _T("Show or hide the toolbar")); tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, - "Toggle &another toolbar\tCtrl-A", - "Show/hide another test toolbar"); + _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, - "&Toggle toolbar size\tCtrl-S", - "Toggle between big/small toolbar"); + _T("&Toggle toolbar size\tCtrl-S"), + _T("Toggle between big/small toolbar")); tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARORIENT, - "Toggle toolbar &orientation\tCtrl-O", - "Toggle toolbar orientation"); + _T("Toggle toolbar &orientation\tCtrl-O"), + _T("Toggle toolbar orientation")); tbarMenu->AppendCheckItem(IDM_TOOLBAR_TOGGLETOOLBARROWS, - "Toggle number of &rows\tCtrl-R", - "Toggle number of toolbar rows between 1 and 2"); + _T("Toggle number of &rows\tCtrl-R"), + _T("Toggle number of toolbar rows between 1 and 2")); 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->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, "Change tool tip", ""); + 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->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"); + tbarMenu->Append(IDM_TOOLBAR_CHANGE_TOOLTIP, _T("Change tool tip"), _T("")); + 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")); wxMenu *fileMenu = new wxMenu; - fileMenu->Append(wxID_EXIT, "E&xit\tAlt-X", "Quit toolbar sample" ); + fileMenu->Append(wxID_EXIT, _T("E&xit\tAlt-X"), _T("Quit toolbar sample") ); wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_HELP, "&About", "About toolbar sample"); + helpMenu->Append(wxID_HELP, _T("&About"), _T("About toolbar sample")); wxMenuBar* menuBar = new wxMenuBar( wxMB_DOCKABLE ); - menuBar->Append(fileMenu, "&File"); - menuBar->Append(tbarMenu, "&Toolbar"); - menuBar->Append(helpMenu, "&Help"); + menuBar->Append(fileMenu, _T("&File")); + menuBar->Append(tbarMenu, _T("&Toolbar")); + 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); // Create the toolbar RecreateToolbar(); + + m_textWindow = new wxTextCtrl(this, wxID_ANY, _T(""), wxPoint(0, 0), wxDefaultSize, wxTE_MULTILINE); } #if USE_GENERIC_TBAR @@ -427,7 +485,7 @@ void MyFrame::LayoutChildren() int offset; if ( m_tbar ) { - m_tbar->SetSize(-1, size.y); + m_tbar->SetSize(wxDefaultCoord, size.y); m_tbar->Move(0, 0); offset = m_tbar->GetSize().x; @@ -468,6 +526,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 ) @@ -481,15 +546,15 @@ void MyFrame::OnToggleAnotherToolbar(wxCommandEvent& WXUNUSED(event)) 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)); @@ -525,12 +590,17 @@ void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } -void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnAbout(wxCommandEvent& event) { - (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar"); + if ( event.IsChecked() ) + m_textWindow->WriteText( _T("Help button down now.\n") ); + else + m_textWindow->WriteText( _T("Help button up now.\n") ); + + (void)wxMessageBox(_T("wxWidgets toolbar sample"), _T("About wxToolBar")); } void MyFrame::OnToolLeftClick(wxCommandEvent& event) @@ -539,14 +609,6 @@ void MyFrame::OnToolLeftClick(wxCommandEvent& event) str.Printf( _T("Clicked on tool %d\n"), event.GetId()); m_textWindow->WriteText( str ); - if (event.GetId() == wxID_HELP) - { - if ( event.GetExtraLong() != 0 ) - m_textWindow->WriteText( _T("Help button down now.\n") ); - else - m_textWindow->WriteText( _T("Help button up now.\n") ); - } - if (event.GetId() == wxID_COPY) { DoEnablePrint(); @@ -563,6 +625,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()); @@ -570,18 +639,22 @@ void MyFrame::OnCombo(wxCommandEvent& event) void MyFrame::DoEnablePrint() { + if ( !m_nPrint ) + return; + wxToolBarBase *tb = GetToolBar(); - if (tb->GetToolEnabled(wxID_PRINT)) - tb->EnableTool( wxID_PRINT, FALSE ); - else - tb->EnableTool( wxID_PRINT, TRUE ); + tb->EnableTool(wxID_PRINT, !tb->GetToolEnabled(wxID_PRINT)); } void MyFrame::DoDeletePrint() { - wxToolBarBase *tb = GetToolBar(); + if ( !m_nPrint ) + return; + wxToolBarBase *tb = GetToolBar(); tb->DeleteTool( wxID_PRINT ); + + m_nPrint--; } void MyFrame::DoToggleHelp() @@ -595,6 +668,14 @@ void MyFrame::OnUpdateCopyAndCut(wxUpdateUIEvent& event) 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)) { GetToolBar()->SetToolShortHelp(wxID_NEW, _T("New toolbar button")); @@ -624,18 +705,22 @@ void MyFrame::OnToolbarStyle(wxCommandEvent& event) void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) { - wxBitmap bmp = wxBITMAP(print); - - GetToolBar()->InsertTool(0, wxID_PRINT, bmp, wxNullBitmap, - FALSE, (wxObject *) NULL, - "Delete this tool", - "This button was inserted into the toolbar"); + m_nPrint++; - GetToolBar()->Realize(); + wxToolBarBase *tb = GetToolBar(); + tb->InsertTool(0, wxID_PRINT, _T("New print"), + wxBITMAP(print), wxNullBitmap, + wxITEM_NORMAL, + _T("Delete this tool"), + _T("This button was inserted into the toolbar")); + + // must call Realize() after adding a new button + tb->Realize(); } void MyFrame::OnToolEnter(wxCommandEvent& event) { +#if wxUSE_STATUSBAR if (event.GetSelection() > -1) { wxString str; @@ -643,6 +728,18 @@ void MyFrame::OnToolEnter(wxCommandEvent& event) SetStatusText(str); } else - SetStatusText(""); + SetStatusText(_T("")); +#else + wxUnusedVar(event); +#endif // wxUSE_STATUSBAR +} + +void MyFrame::OnToggleRadioBtn(wxCommandEvent& event) +{ + if ( m_tbar ) + { + m_tbar->ToggleTool(IDM_TOOLBAR_OTHER_1 + + event.GetId() - IDM_TOOLBAR_TOGGLERADIOBTN1, true); + } }