X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92a19c2e7757ba742846f83e56356de0a607bdc2..15e758d12fa76057e91d9cf8f15d8c9de232e535:/samples/toolbar/toolbar.cpp diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp index 8ec29ca590..e115cb6be7 100644 --- a/samples/toolbar/toolbar.cpp +++ b/samples/toolbar/toolbar.cpp @@ -120,8 +120,6 @@ public: void OnUpdateCopyAndCut(wxUpdateUIEvent& event); - void OnToggleFullScreen(wxCommandEvent& event); - #if USE_GENERIC_TBAR virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, @@ -163,7 +161,6 @@ enum IDM_TOOLBAR_DELETEPRINT, IDM_TOOLBAR_INSERTPRINT, IDM_TOOLBAR_TOGGLEHELP, - IDM_TOOLBAR_TOGGLEFULLSCREEN, IDM_TOOLBAR_TOGGLE_ANOTHER_TOOLBAR, IDM_TOOLBAR_CHANGE_TOOLTIP, @@ -193,7 +190,6 @@ 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) @@ -246,7 +242,7 @@ void MyFrame::RecreateToolbar() style |= m_horzToolbar ? wxTB_HORIZONTAL : wxTB_VERTICAL; toolBar = CreateToolBar(style, ID_TOOLBAR); - toolBar->SetMargins( 4, 4 ); + //toolBar->SetMargins( 4, 4 ); // Set up toolbar wxBitmap toolBarBitmaps[8]; @@ -297,7 +293,7 @@ void MyFrame::RecreateToolbar() 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__) +#if (wxUSE_TOOLBAR_NATIVE && !USE_GENERIC_TBAR) && !defined(__WXMOTIF__) && !defined(__WXX11__) // adding a combo to a vertical toolbar is not very smart if ( m_horzToolbar ) { @@ -389,8 +385,6 @@ MyFrame::MyFrame(wxFrame* parent, 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" ); @@ -604,8 +598,3 @@ void MyFrame::OnToolEnter(wxCommandEvent& event) SetStatusText(""); } -void MyFrame::OnToggleFullScreen(wxCommandEvent& event) -{ - ShowFullScreen(!IsFullScreen()); -} -