Fix signatures of various image handlers methods.

Use wxBitmapType instead of long for the type parameter and made SaveFile()
methods const to follow the base class changes.

Now that the signatures are the same as in the base class these handlers have
a chance to work again while their methods couldn't be called at all before
this change.

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

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index c8b6a2d14fcb45c9b9fd5b131557be6ab82aab2a..e528547e835e1dca13ba9f3c8b3d11229adc770e 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -1304,7 +1304,6 @@ int GrGetPixelColor(GR_SCREEN_INFO* sinfo, GR_PALETTE* palette, GR_PIXELVAL pixe
 
 class wxXPMFileHandler : public wxBitmapHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
 public:
     wxXPMFileHandler()
     {
@@ -1313,21 +1312,31 @@ public:
         SetType( wxBITMAP_TYPE_XPM );
     };
 
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name,
+                          wxBitmapType flags,
                           int desiredWidth, int desiredHeight);
 
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
-                          int type, const wxPalette *palette = NULL);
-
-    virtual bool Create(wxBitmap *WXUNUSED(bitmap), const void* WXUNUSED(data), long WXUNUSED(flags),
-                        int WXUNUSED(width), int WXUNUSED(height), int WXUNUSED(depth) = 1)
+                          wxBitmapType type,
+                          const wxPalette *palette = NULL) const;
+
+    virtual bool Create(wxBitmap *WXUNUSED(bitmap),
+                        const void* WXUNUSED(data),
+                        wxBitmapType WXUNUSED(flags),
+                        int WXUNUSED(width),
+                        int WXUNUSED(height),
+                        int WXUNUSED(depth) = 1)
         { return false; }
+
+    DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
 
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
-                                long WXUNUSED(flags), int WXUNUSED(desiredWidth),
+bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap,
+                                const wxString& name,
+                                wxBitmapType WXUNUSED(flags),
+                                int WXUNUSED(desiredWidth),
                                 int WXUNUSED(desiredHeight))
 {
 #if wxHAVE_LIB_XPM
@@ -1394,12 +1403,14 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
 #endif // wxHAVE_LIB_XPM / wxUSE_STREAMS
 }
 
-bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
-                                int type,
-                                const wxPalette *WXUNUSED(palette))
+bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap,
+                                const wxString& name,
+                                wxBitmapType type,
+                                const wxPalette *WXUNUSED(palette)) const
 {
     wxImage image(bitmap->ConvertToImage());
-    if (image.Ok()) return image.SaveFile( name, (wxBitmapType)type );
+    if (image.Ok())
+        return image.SaveFile( name, type );
 
     return false;
 }
@@ -1431,7 +1442,7 @@ public:
     virtual bool SaveFile(const wxBitmap *WXUNUSED(bitmap),
                           const wxString& WXUNUSED(name),
                           wxBitmapType WXUNUSED(type),
-                          const wxPalette *WXUNUSED(palette) = NULL)
+                          const wxPalette *WXUNUSED(palette) = NULL) const
         { return false; }
 
     virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType flags,
@@ -1529,25 +1540,25 @@ public:
 
     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(type),
-                          const wxPalette *WXUNUSED(palette) = NULL)
+                          wxBitmapType WXUNUSED(type),
+                          const wxPalette *WXUNUSED(palette) = NULL) const
         { return false; }
 
-    virtual bool Create(wxBitmap *bitmap, const void* data, long flags,
+    virtual bool Create(wxBitmap *bitmap, const void* data, wxBitmapType type,
                         int width, int height, int depth = 1);
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler)
 
 bool wxXBMDataHandler::Create( wxBitmap *bitmap, const void* bits,
-                               long WXUNUSED(flags),
+                               wxBitmapType WXUNUSED(type),
                                int width, int height, int WXUNUSED(depth))
 {
 #if !wxUSE_NANOX