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

calls to wxDynamicToolBar::AddTool(int,wxBitmap&) confused egcs-1.1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-03-30 19:29:02 +00:00
parent f1d534dfb5
commit cd7f122719
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/framelayout/samples/demo/fl_demo.cpp
View File

@@ -813,11 +813,11 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent )
pTBar4->EnableTool( 4, FALSE ); pTBar4->EnableTool( 4, FALSE );
#else #else
pTBar2->AddTool( 2, search_xpm ); pTBar2->AddTool( 2, search_xpm, "" );
//pTBar2->AddSeparator(); //pTBar2->AddSeparator();
pTBar2->AddTool( 3, bookmarks_xpm ); pTBar2->AddTool( 3, bookmarks_xpm, "" );
pTBar2->AddTool( 4, nextmark_xpm ); pTBar2->AddTool( 4, nextmark_xpm, "" );
pTBar2->AddTool( 5, prevmark_xpm ); pTBar2->AddTool( 5, prevmark_xpm, "" );
wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 ); wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 );
@@ -1091,13 +1091,13 @@ void MyFrame::DropInSomeBars( int layoutNo )
pToolBar->AddTool( 1005, wxBitmap("copy_icon") ); pToolBar->AddTool( 1005, wxBitmap("copy_icon") );
pToolBar->AddTool( 1006, wxBitmap("paste_icon") ); pToolBar->AddTool( 1006, wxBitmap("paste_icon") );
#else #else
pToolBar->AddTool( 1001, wxBitmap(new_xpm) ); pToolBar->AddTool( 1001, wxBitmap(new_xpm), "" );
pToolBar->AddTool( 1002, wxBitmap(open_xpm) ); pToolBar->AddTool( 1002, wxBitmap(open_xpm), "" );
pToolBar->AddTool( 1003, wxBitmap(save_xpm) ); pToolBar->AddTool( 1003, wxBitmap(save_xpm), "" );
pToolBar->AddTool( 1004, wxBitmap(cut_xpm) ); pToolBar->AddTool( 1004, wxBitmap(cut_xpm), "" );
pToolBar->AddTool( 1005, wxBitmap(copy_xpm) ); pToolBar->AddTool( 1005, wxBitmap(copy_xpm), "" );
pToolBar->AddTool( 1006, wxBitmap(paste_xpm) ); pToolBar->AddTool( 1006, wxBitmap(paste_xpm), "" );
#endif #endif
layout.AddBar( pToolBar, // bar window (can be NULL) layout.AddBar( pToolBar, // bar window (can be NULL)
sizes10, wxTOP, // alignment ( 0-top,1-bottom, etc) sizes10, wxTOP, // alignment ( 0-top,1-bottom, etc)