use wxBitmapType instead of int

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

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 942b496aec78cebe873fa80f4a0231c005a39fa5..644308277a3e8a9ab1713e68257b8490c832dd55 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -116,17 +116,17 @@ public:
        // overridables
 
        virtual void AddTool( int toolIndex, 
-                                                 wxWindow* pToolWindow, 
-                                                 const wxSize& size = wxDefaultSize );
-
-       virtual void AddTool( int toolIndex, 
-                                                 const wxString& imageFileName,
-                                                 int imageFileType = wxBITMAP_TYPE_BMP,
-                                                 const wxString& labelText = "", bool alignTextRight = FALSE,
-                                                 bool isFlat = TRUE );
-       virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                                                 const wxString& labelText = "", bool alignTextRight = FALSE,
-                                                 bool isFlat = TRUE );
+                              wxWindow* pToolWindow, 
+                              const wxSize& size = wxDefaultSize );
+
+        virtual void AddTool( int toolIndex, 
+                              const wxString& imageFileName,
+                              wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );
+        virtual void AddTool( int toolIndex, wxBitmap labelBmp,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
+                              bool isFlat = TRUE );
 
        // method from wxToolBarBase (for compatibility), only
        // first two arguments are valid

diff --git a/contrib/src/fl/dyntbar.cpp b/contrib/src/fl/dyntbar.cpp
index fe381fa5908976fb68e327f725f61dc0184e9444..7c218123af9ad396b71dc779230148fa02a82330 100644 (file)
--- a/contrib/src/fl/dyntbar.cpp
+++ b/contrib/src/fl/dyntbar.cpp
@@ -125,10 +125,10 @@ void wxDynamicToolBar::AddTool( int toolIndex,
 }
 
 void wxDynamicToolBar::AddTool( int toolIndex, 
-                                                               const wxString& imageFileName,
-                                                               int imageFileType, 
-                                                               const wxString& labelText, bool alignTextRight,
-                                                               bool isFlat )
+                                const wxString& imageFileName,
+                                wxBitmapType imageFileType, 
+                                const wxString& labelText, bool alignTextRight,
+                                bool isFlat )
 {
        wxNewBitmapButton* pBtn =