Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fix to the sample

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-16 17:39:07 +00:00
parent f35aa3daa3
commit 9fb35cf180
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/toolbar/toolbar.cpp
View File

@@ -32,12 +32,12 @@
#include <wx/log.h> #include <wx/log.h>
// define this to 1 to use wxToolBarSimple instead of the native one // define this to 1 to use wxToolBarSimple instead of the native one
#define USE_GENERIC_TBAR 1 #define USE_GENERIC_TBAR 0
#if USE_GENERIC_TBAR #if USE_GENERIC_TBAR
#if !wxUSE_TOOLBAR_SIMPLE #if !wxUSE_TOOLBAR_SIMPLE
#error "wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE "\ #error wxToolBarSimple is not compiled in, set wxUSE_TOOLBAR_SIMPLE \
"to 1 in setup.h and recompile the library." to 1 in setup.h and recompile the library.
#else #else
#include <wx/tbarsmpl.h> #include <wx/tbarsmpl.h>
#endif #endif
@@ -217,6 +217,13 @@ void MyFrame::RecreateToolbar()
wxBitmap toolBarBitmaps[8]; wxBitmap toolBarBitmaps[8];
toolBarBitmaps[0] = wxBITMAP(new); toolBarBitmaps[0] = wxBITMAP(new);
#if 0
toolBar->AddTool(wxID_NEW, toolBarBitmaps[0], wxNullBitmap, FALSE, -1, -1,
(wxObject *) NULL, "New file");
toolBar->Realize();
return;
#endif
toolBarBitmaps[1] = wxBITMAP(open); toolBarBitmaps[1] = wxBITMAP(open);
if ( !m_smallToolbar ) if ( !m_smallToolbar )
{ {
@@ -372,7 +379,7 @@ void MyFrame::OnToggleToolbarRows(wxCommandEvent& WXUNUSED(event))
GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows); GetToolBar()->SetRows(m_horzToolbar ? m_rows : 10 / m_rows);
//RecreateToolbar(); //RecreateToolbar(); -- this is unneeded
} }
void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnToggleToolbarOrient(wxCommandEvent& WXUNUSED(event))