X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/980662342f10c5254360f89aa1416771be5a1342..ba7bd901502db16ac1ff00f8da84c5bcda8a7466:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 22c7e26383..c839ceee55 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -30,12 +30,37 @@ #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" @@ -45,7 +70,7 @@ #include "bitmaps/preview.xpm" // paste XPM #include "bitmaps/print.xpm" #include "bitmaps/help.xpm" -#endif // GTK or Motif +#endif // USE_XPM_BITMAPS // ---------------------------------------------------------------------------- // classes @@ -74,14 +99,19 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnSize(wxSizeEvent& event); + + void OnToggleAnotherToolbar(wxCommandEvent& event); + void OnToggleToolbarSize(wxCommandEvent& event); void OnToggleToolbarOrient(wxCommandEvent& event); void OnToggleToolbarRows(wxCommandEvent& event); - void OnEnablePrint(wxCommandEvent& event) { DoEnablePrint(); } - void OnDeletePrint(wxCommandEvent& event) { DoDeletePrint(); } + 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 OnToolLeftClick(wxCommandEvent& event); void OnToolEnter(wxCommandEvent& event); @@ -90,16 +120,28 @@ public: void OnUpdateCopyAndCut(wxUpdateUIEvent& event); + void OnToggleFullScreen(wxCommandEvent& 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(); + void LayoutChildren(); + bool m_smallToolbar, m_horzToolbar; size_t m_rows; // 1 or 2 only - wxTextCtrl* m_textWindow; + wxTextCtrl *m_textWindow; + + wxToolBar *m_tbar; DECLARE_EVENT_TABLE() }; @@ -110,6 +152,8 @@ private: const int ID_TOOLBAR = 500; +static const long TOOLBAR_STYLE = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE; + enum { IDM_TOOLBAR_TOGGLETOOLBARSIZE = 200, @@ -119,6 +163,9 @@ enum IDM_TOOLBAR_DELETEPRINT, IDM_TOOLBAR_INSERTPRINT, IDM_TOOLBAR_TOGGLEHELP, + IDM_TOOLBAR_TOGGLEFULLSCREEN, + IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, + IDM_TOOLBAR_CHANGE_TOOLTIP, ID_COMBO = 1000 }; @@ -131,9 +178,13 @@ 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_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) @@ -142,6 +193,8 @@ 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_TOGGLEFULLSCREEN, MyFrame::OnToggleFullScreen) + EVT_MENU(IDM_TOOLBAR_CHANGE_TOOLTIP, MyFrame::OnChangeToolTip) EVT_MENU(-1, MyFrame::OnToolLeftClick) @@ -184,12 +237,12 @@ bool MyApp::OnInit() void MyFrame::RecreateToolbar() { // delete and recreate the toolbar - wxToolBar *toolBar = GetToolBar(); + wxToolBarBase *toolBar = GetToolBar(); delete toolBar; SetToolBar(NULL); - long style = wxNO_BORDER | wxTB_FLAT | wxTB_DOCKABLE; + long style = TOOLBAR_STYLE; style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; toolBar = CreateToolBar(style, ID_TOOLBAR); @@ -198,16 +251,37 @@ void MyFrame::RecreateToolbar() // 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 ) { - toolBarBitmaps[2] = wxBITMAP(save); - toolBarBitmaps[3] = wxBITMAP(copy); - toolBarBitmaps[4] = wxBITMAP(cut); - toolBarBitmaps[5] = wxBITMAP(paste); - toolBarBitmaps[6] = wxBITMAP(print); - toolBarBitmaps[7] = wxBITMAP(help); + int w = 2*toolBarBitmaps[0].GetWidth(), + h = 2*toolBarBitmaps[0].GetHeight(); + for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ ) + { + toolBarBitmaps[n] = + wxImage(toolBarBitmaps[n]).Scale(w, h).ConvertToBitmap(); + } + + toolBar->SetToolBitmapSize(wxSize(w, h)); } #ifdef __WXMSW__ @@ -222,34 +296,37 @@ void MyFrame::RecreateToolbar() currentX += width + 5; toolBar->AddTool(wxID_OPEN, toolBarBitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file"); + // neither the generic nor Motif native toolbars really support this +#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) // adding a combo to a vertical toolbar is not very smart if ( m_horzToolbar ) { - wxComboBox *combo = new wxComboBox(toolBar, ID_COMBO); + 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"); +/* + wxTextCtrl *combo = new wxTextCtrl( toolBar, -1, "", wxDefaultPosition, wxSize(80,-1) ); +*/ toolBar->AddControl(combo); } +#endif // toolbars which don't support controls - if ( !m_smallToolbar ) - { - 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"); - } + 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"); // after adding the buttons to the toolbar, must call Realize() to reflect // the changes @@ -271,9 +348,10 @@ 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; @@ -285,6 +363,11 @@ MyFrame::MyFrame(wxFrame* parent, // Make a menubar wxMenu *tbarMenu = new wxMenu; + 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", @@ -304,6 +387,10 @@ MyFrame::MyFrame(wxFrame* parent, 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->Append(IDM_TOOLBAR_TOGGLEFULLSCREEN, "Toggle &full screen mode\tCtrl-F", ""); wxMenu *fileMenu = new wxMenu; fileMenu->Append(wxID_EXIT, "E&xit", "Quit toolbar sample" ); @@ -324,6 +411,74 @@ MyFrame::MyFrame(wxFrame* parent, RecreateToolbar(); } +#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(); + + 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 + { + m_tbar = new wxToolBar(this, -1, + wxDefaultPosition, wxDefaultSize, + TOOLBAR_STYLE | wxTB_VERTICAL); + m_tbar->AddTool(wxID_HELP, wxBITMAP(help), + wxNullBitmap, FALSE, + NULL, + "This is the help button", + "This is the long help for the help button"); + m_tbar->Realize(); + } + + LayoutChildren(); +} + void MyFrame::OnToggleToolbarSize(wxCommandEvent& WXUNUSED(event)) { m_smallToolbar = !m_smallToolbar; @@ -338,7 +493,7 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event)) GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows); - //RecreateToolbar(); + //RecreateToolbar(); -- this is unneeded } void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) @@ -395,7 +550,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 @@ -404,14 +559,14 @@ 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 ) ); } @@ -420,6 +575,11 @@ 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::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) { wxBitmap bmp = wxBITMAP(print); @@ -434,13 +594,18 @@ void MyFrame::OnInsertPrint(wxCommandEvent& WXUNUSED(event)) 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(""); +} + +void MyFrame::OnToggleFullScreen(wxCommandEvent& event) +{ + ShowFullScreen(!IsFullScreen()); }