X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08973ff0aae30e8cdec453ee4201aac84f05ee29..f1d534dfb5a3f149f68a305a6142e824fff19346:/utils/framelayout/samples/demo/fl_demo.cpp diff --git a/utils/framelayout/samples/demo/fl_demo.cpp b/utils/framelayout/samples/demo/fl_demo.cpp index 424913c47f..60ee20f6ef 100644 --- a/utils/framelayout/samples/demo/fl_demo.cpp +++ b/utils/framelayout/samples/demo/fl_demo.cpp @@ -232,10 +232,11 @@ void StartButton95::OnPaint( wxPaintEvent& event ) mDBmp.LoadFile( "start95_dp_icon", wxBITMAP_TYPE_BMP_RESOURCE ); -#endif +#else if ( !mDBmp.Ok() ) mDBmp = wxBitmap(start95_dp_xpm); +#endif pBmp = &mDBmp; } @@ -768,7 +769,7 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent ) new cbDynToolBarDimHandler() ); - cbDimInfo sizes4( 430,35, // when docked horizontally + cbDimInfo sizes4( 450,35, // when docked horizontally 44,375, // when docked vertically 80,100, // when floated TRUE, // the bar is fixed-size @@ -789,8 +790,6 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent ) pTBar2->AddTool( 4, wxBitmap("nextmark_icon") ); pTBar2->AddTool( 5, wxBitmap("prevmark_icon") ); - - wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 ); pTBar3->AddTool( 1, wxBitmap("open_icon"), " Open " ); @@ -820,7 +819,6 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent ) pTBar2->AddTool( 4, nextmark_xpm ); pTBar2->AddTool( 5, prevmark_xpm ); - wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 ); pTBar3->AddTool( 1, wxBitmap(open_xpm), " Open " ); @@ -831,6 +829,8 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent ) pTBar3->AddTool( 5, wxBitmap(copy_xpm), " Copy " ); pTBar3->AddTool( 6, wxBitmap(paste_xpm), " Paste " ); + pTBar3->EnableTool( 2, FALSE ); + wxDynamicToolBar* pTBar4 = new wxDynamicToolBar( mpInternalFrm, -1 ); pTBar4->AddTool( 1, wxBitmap(bookmarks_xpm), "Bookmarks ", TRUE ); @@ -838,6 +838,8 @@ void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent ) pTBar4->AddTool( 3, wxBitmap(prevmark_xpm), "Prev bookmark ", TRUE ); //pTBar4->AddSeparator(); pTBar4->AddTool( 4, wxBitmap(search_xpm),"Search ", TRUE ); + + pTBar4->EnableTool( 4, FALSE ); #endif layout.AddBar( pTBar2, @@ -1080,7 +1082,7 @@ void MyFrame::DropInSomeBars( int layoutNo ) pToolBar->Create( mpInternalFrm, -1 ); // 1001-1006 ids of command events fired by added tool-buttons -#ifdef __WXMSW__ +#ifdef __WXMSW__ pToolBar->AddTool( 1001, wxBitmap("new_icon") ); pToolBar->AddTool( 1002, wxBitmap("open_icon") ); pToolBar->AddTool( 1003, wxBitmap("save_icon") );