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

use wxBitmapType instead of int

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-09-09 17:57:31 +00:00
parent 52b5ab7edc
commit 8252c9ca38
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/include/wx/fl/dyntbar.h
View File

@@ -116,17 +116,17 @@ public:
// overridables // overridables
virtual void AddTool( int toolIndex, virtual void AddTool( int toolIndex,
wxWindow* pToolWindow, wxWindow* pToolWindow,
const wxSize& size = wxDefaultSize ); const wxSize& size = wxDefaultSize );
virtual void AddTool( int toolIndex, virtual void AddTool( int toolIndex,
const wxString& imageFileName, const wxString& imageFileName,
int imageFileType = wxBITMAP_TYPE_BMP, wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "", bool alignTextRight = FALSE, const wxString& labelText = "", bool alignTextRight = FALSE,
bool isFlat = TRUE ); bool isFlat = TRUE );
virtual void AddTool( int toolIndex, wxBitmap labelBmp, virtual void AddTool( int toolIndex, wxBitmap labelBmp,
const wxString& labelText = "", bool alignTextRight = FALSE, const wxString& labelText = "", bool alignTextRight = FALSE,
bool isFlat = TRUE ); bool isFlat = TRUE );
// method from wxToolBarBase (for compatibility), only // method from wxToolBarBase (for compatibility), only
// first two arguments are valid // first two arguments are valid

8
contrib/src/fl/dyntbar.cpp
View File

@@ -125,10 +125,10 @@ void wxDynamicToolBar::AddTool( int toolIndex,
} }
void wxDynamicToolBar::AddTool( int toolIndex, void wxDynamicToolBar::AddTool( int toolIndex,
const wxString& imageFileName, const wxString& imageFileName,
int imageFileType, wxBitmapType imageFileType,
const wxString& labelText, bool alignTextRight, const wxString& labelText, bool alignTextRight,
bool isFlat ) bool isFlat )
{ {
wxNewBitmapButton* pBtn = wxNewBitmapButton* pBtn =