mingw compilation fix

[wxWidgets.git] / contrib / src / fl / newbmpbtn.cpp

diff --git a/contrib/src/fl/newbmpbtn.cpp b/contrib/src/fl/newbmpbtn.cpp
index be095bd9151306bc13aaec9cea4185eadd5a290b..d1c8ed74535202b2c867ba3facc9652e4ecb4f5d 100644 (file)
--- 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 ),
                mIsSticky( isSticky ),
                mIsFlat( isFlat ),
                mLabelText( labelText ),

-               mImageFileType( -1 ),
+               mImageFileType( wxBITMAP_TYPE_INVALID ),

                mDepressedBmp( labelBitmap ),
 
                mpDepressedImg( NULL ),
                mDepressedBmp( labelBitmap ),
 
                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 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 ),
 
        :       mTextToLabelGap  ( 2 ),
                mMarginX( 2 ),