X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e08b761b0c5ecb6df295785b78f1f3637331887..14dd645ee16eb022afb19f35d0c8cfdf2d3cdee9:/contrib/src/fl/newbmpbtn.cpp diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp index be095bd915..d1c8ed7453 100644 --- a/contrib/src/fl/newbmpbtn.cpp +++ b/contrib/src/fl/newbmpbtn.cpp @@ -228,7 +228,7 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, mIsSticky( isSticky ), mIsFlat( isFlat ), mLabelText( labelText ), - mImageFileType( -1 ), + mImageFileType( wxBITMAP_TYPE_INVALID ), mDepressedBmp( labelBitmap ), mpDepressedImg( NULL ), @@ -257,15 +257,15 @@ wxNewBitmapButton::wxNewBitmapButton( const wxBitmap& labelBitmap, } wxNewBitmapButton::wxNewBitmapButton( const wxString& bitmapFileName, - const int bitmapFileType, - const wxString& labelText, - int alignText, - bool isFlat, - int firedEventType, - int marginX, - int marginY, - int textToLabelGap, - bool isSticky) + const wxBitmapType bitmapFileType, + const wxString& labelText, + int alignText, + bool isFlat, + int firedEventType, + int marginX, + int marginY, + int textToLabelGap, + bool isSticky) : mTextToLabelGap ( 2 ), mMarginX( 2 ),