fix wxXPMDataHandler silently broken by long->wxBitmapType change

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 5f9df2b7e233b76fb4a7f58fe86af9f8ede8b29b..ec233b0c9314283795696f520a659b37d066bffb 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1427,25 +1427,25 @@ public:
 
     virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),
 
     virtual bool LoadFile(wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),

-                          long WXUNUSED(flags),
+                          wxBitmapType WXUNUSED(flags),

                           int WXUNUSED(desiredWidth),
                           int WXUNUSED(desiredHeight))
         { return false; }
 
     virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),
                           int WXUNUSED(desiredWidth),
                           int WXUNUSED(desiredHeight))
         { return false; }
 
     virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),

-                          int WXUNUSED(type),
+                          wxBitmapType WXUNUSED(type),

                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 
                           const wxPalette *WXUNUSED(palette) = NULL)
         { return false; }
 

-    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
+    virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags,

                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,

-                              long WXUNUSED(flags),
+                              wxBitmapType WXUNUSED(flags),

                               int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
 {
 #if wxHAVE_LIB_XPM
                               int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth))
 {
 #if wxHAVE_LIB_XPM