use wxBitmapType instead of int

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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

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 ),
-               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 ),