From 8252c9ca38ccb486d476bd450512c6a8b32bb3d9 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sun, 9 Sep 2001 17:57:31 +0000 Subject: [PATCH] use wxBitmapType instead of int git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/fl/dyntbar.h | 22 +++++++++++----------- contrib/src/fl/dyntbar.cpp | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h index 942b496aec..644308277a 100644 --- a/contrib/include/wx/fl/dyntbar.h +++ b/contrib/include/wx/fl/dyntbar.h @@ -116,17 +116,17 @@ public: // overridables virtual void AddTool( int toolIndex, - wxWindow* pToolWindow, - const wxSize& size = wxDefaultSize ); - - virtual void AddTool( int toolIndex, - const wxString& imageFileName, - int imageFileType = wxBITMAP_TYPE_BMP, - const wxString& labelText = "", bool alignTextRight = FALSE, - bool isFlat = TRUE ); - virtual void AddTool( int toolIndex, wxBitmap labelBmp, - const wxString& labelText = "", bool alignTextRight = FALSE, - bool isFlat = TRUE ); + wxWindow* pToolWindow, + const wxSize& size = wxDefaultSize ); + + virtual void AddTool( int toolIndex, + const wxString& imageFileName, + wxBitmapType imageFileType = wxBITMAP_TYPE_BMP, + const wxString& labelText = "", bool alignTextRight = FALSE, + bool isFlat = TRUE ); + virtual void AddTool( int toolIndex, wxBitmap labelBmp, + const wxString& labelText = "", bool alignTextRight = FALSE, + bool isFlat = TRUE ); // method from wxToolBarBase (for compatibility), only // first two arguments are valid diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp index fe381fa590..7c218123af 100644 --- a/contrib/src/fl/dyntbar.cpp +++ b/contrib/src/fl/dyntbar.cpp @@ -125,10 +125,10 @@ void wxDynamicToolBar::AddTool( int toolIndex, } void wxDynamicToolBar::AddTool( int toolIndex, - const wxString& imageFileName, - int imageFileType, - const wxString& labelText, bool alignTextRight, - bool isFlat ) + const wxString& imageFileName, + wxBitmapType imageFileType, + const wxString& labelText, bool alignTextRight, + bool isFlat ) { wxNewBitmapButton* pBtn = -- 2.47.2