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@11579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-09-09 17:42:06 +00:00
parent 84553c516c
commit 52b5ab7edc
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/include/wx/fl/newbmpbtn.h
View File

@@ -50,7 +50,7 @@ protected:
wxString mLabelText; wxString mLabelText;
wxString mImageFileName; wxString mImageFileName;
int mImageFileType; wxBitmapType mImageFileType;
wxBitmap mDepressedBmp; // source image for rendering wxBitmap mDepressedBmp; // source image for rendering
// labels for particular state // labels for particular state
@@ -114,17 +114,17 @@ public:
// use this constructor if buttons have to be persistant // use this constructor if buttons have to be persistant
wxNewBitmapButton( const wxString& bitmapFileName, wxNewBitmapButton( const wxString& bitmapFileName,
const int bitmapFileType = wxBITMAP_TYPE_BMP, const wxBitmapType bitmapFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "", const wxString& labelText = "",
int alignText = NB_ALIGN_TEXT_BOTTOM, int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE, bool isFlat = TRUE,
// this is the default type of fired events // this is the default type of fired events
int firedEventType = wxEVT_COMMAND_MENU_SELECTED, int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
int marginX = 2, int marginX = 2,
int marginY = 2, int marginY = 2,
int textToLabelGap = 2, int textToLabelGap = 2,
bool isSticky = FALSE bool isSticky = FALSE
); );
~wxNewBitmapButton(); ~wxNewBitmapButton();

20
contrib/src/fl/newbmpbtn.cpp
View File

@@ -228,7 +228,7 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
mIsSticky( isSticky ), mIsSticky( isSticky ),
mIsFlat( isFlat ), mIsFlat( isFlat ),
mLabelText( labelText ), mLabelText( labelText ),
mImageFileType( -1 ), mImageFileType( wxBITMAP_TYPE_INVALID ),
mDepressedBmp( labelBitmap ), mDepressedBmp( labelBitmap ),
mpDepressedImg( NULL ), mpDepressedImg( NULL ),
@@ -257,15 +257,15 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap,
} }
wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName,
const int bitmapFileType, const wxBitmapType bitmapFileType,
const wxString& labelText, const wxString& labelText,
int alignText, int alignText,
bool isFlat, bool isFlat,
int firedEventType, int firedEventType,
int marginX, int marginX,
int marginY, int marginY,
int textToLabelGap, int textToLabelGap,
bool isSticky) bool isSticky)
: mTextToLabelGap ( 2 ), : mTextToLabelGap ( 2 ),
mMarginX( 2 ), mMarginX( 2 ),