applying patch, fixes #10524

[wxWidgets.git] / src / os2 / gdiimage.cpp

diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp
index 4c2fee54259d262a30f38f03f2d458fefa288fc6..06f1951f63e74785abdce2b4a0aff3d13ce07a5c 100644 (file)
--- a/src/os2/gdiimage.cpp
+++ b/src/os2/gdiimage.cpp
@@ -50,20 +50,20 @@ public:
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName

-                          ,int              lType
+                          ,wxBitmapType     lType

                           ,const wxPalette* pPalette = NULL
                          );
 
 private:
     inline virtual bool LoadFile( wxBitmap*       pBitmap
                                  ,int             nId
                           ,const wxPalette* pPalette = NULL
                          );
 
 private:
     inline virtual bool LoadFile( wxBitmap*       pBitmap
                                  ,int             nId

-                                 ,long            lFlags
+                                 ,wxBitmapType    lFlags

                                  ,int             nDesiredWidth
                                  ,int             nDesiredHeight
                                 )
                                  ,int             nDesiredWidth
                                  ,int             nDesiredHeight
                                 )


@@ -89,7 +89,7 @@ public:
 
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,int             nId
 
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,int             nId

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );


@@ -103,7 +103,7 @@ class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
 public:
     wxIconHandler( const wxString& rName
                   ,const wxString& rExt
 public:
     wxIconHandler( const wxString& rName
                   ,const wxString& rExt

-                  ,long            lType
+                  ,wxBitmapType    lType

                  ) : wxGDIImageHandler( rName
                                        ,rExt
                                        ,lType
                  ) : wxGDIImageHandler( rName
                                        ,rExt
                                        ,lType


@@ -114,7 +114,7 @@ public:
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)
                         ,const void* WXUNUSED(pData)
     // creating and saving icons is not supported
     virtual bool Create( wxGDIImage* WXUNUSED(pImage)
                         ,const void* WXUNUSED(pData)

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

                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)
                         ,int         WXUNUSED(nDepth) = 1
                         ,int         WXUNUSED(nWidth)
                         ,int         WXUNUSED(nHeight)
                         ,int         WXUNUSED(nDepth) = 1


@@ -123,17 +123,17 @@ public:
         return false;
     }
 
         return false;
     }
 

-    virtual bool Save( wxGDIImage*     WXUNUSED(pImage)
-                      ,const wxString& WXUNUSED(rName)
-                      ,int             WXUNUSED(nType)
-                     )
+    virtual bool Save( const wxGDIImage* WXUNUSED(pImage)
+                      ,const wxString&   WXUNUSED(rName)
+                      ,wxBitmapType      WXUNUSED(nType)
+                     ) const

     {
         return false;
     }
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                       ,HPS             hPs
     {
         return false;
     }
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                       ,HPS             hPs

-                      ,long            lFlags
+                      ,wxBitmapType    lFlags

                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      )
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      )


@@ -154,14 +154,14 @@ protected:
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          ) = 0;
 private:
     inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
                               int         WXUNUSED(nId),
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          ) = 0;
 private:
     inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
                               int         WXUNUSED(nId),

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

                               int         WXUNUSED(nDesiredWidth),
                               int         WXUNUSED(nDesiredHeight) )
     {
                               int         WXUNUSED(nDesiredWidth),
                               int         WXUNUSED(nDesiredHeight) )
     {


@@ -181,7 +181,7 @@ public:
     virtual bool LoadIcon( wxIcon *        pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon *        pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );


@@ -202,7 +202,7 @@ public:
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs
     virtual bool LoadIcon( wxIcon*         pIcon
                           ,const wxString& rName
                           ,HPS             hPs

-                          ,long            lFlags
+                          ,wxBitmapType    lFlags

                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );
                           ,int             nDesiredWidth = -1
                           ,int             nDesiredHeight = -1
                          );


@@ -287,12 +287,12 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
             return pHandler;
         pNode = pNode->GetNext();
     }
             return pHandler;
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rExtension
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
   const wxString&                   rExtension

-, long                              lType
+, wxBitmapType                      lType

 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();
 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();


@@ -307,11 +307,11 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
         }
         pNode = pNode->GetNext();
     }
         }
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(
 }
 
 wxGDIImageHandler* wxGDIImage::FindHandler(

-  long                              lType
+  wxBitmapType                           lType

 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();
 )
 {
     wxGDIImageHandlerList::compatibility_iterator   pNode = ms_handlers.GetFirst();


@@ -324,7 +324,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
             return pHandler;
         pNode = pNode->GetNext();
     }
             return pHandler;
         pNode = pNode->GetNext();
     }

-    return((wxGDIImageHandler*)NULL);
+    return(NULL);

 }
 
 void wxGDIImage::CleanUpHandlers()
 }
 
 void wxGDIImage::CleanUpHandlers()


@@ -356,7 +356,7 @@ void wxGDIImage::InitStandardHandlers()
 
 bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
                                      int       nId,
 
 bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
                                      int       nId,

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

                                      int       WXUNUSED(nDesiredWidth),
                                      int       WXUNUSED(nDesiredHeight) )
 {
                                      int       WXUNUSED(nDesiredWidth),
                                      int       WXUNUSED(nDesiredHeight) )
 {


@@ -391,7 +391,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
 bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),
 bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),

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

                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {
                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {


@@ -419,7 +419,7 @@ bool wxBMPFileHandler::LoadFile( wxBitmap*       pBitmap,
 
 bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
                                  const wxString&  WXUNUSED(rName),
 
 bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
                                  const wxString&  WXUNUSED(rName),

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

                                  const wxPalette* pPal )
 {
 #if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2
                                  const wxPalette* pPal )
 {
 #if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2


@@ -446,7 +446,7 @@ bool wxBMPFileHandler::SaveFile( wxBitmap*        pBitmap,
 bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),
 bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
                                  const wxString& WXUNUSED(rName),
                                  HPS             WXUNUSED(hPs),

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

                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {
                                  int             WXUNUSED(nDesiredWidth),
                                  int             WXUNUSED(nDesiredHeight) )
 {


@@ -463,7 +463,7 @@ bool wxICOFileHandler::LoadIcon( wxIcon*         pIcon,
 bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
                                      const wxString& rName,
                                      HPS             WXUNUSED(hPs),
 bool wxICOResourceHandler::LoadIcon( wxIcon*         pIcon,
                                      const wxString& rName,
                                      HPS             WXUNUSED(hPs),

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

                                      int             WXUNUSED(nDesiredWidth),
                                      int             WXUNUSED(nDesiredHeight) )
 {
                                      int             WXUNUSED(nDesiredWidth),
                                      int             WXUNUSED(nDesiredHeight) )
 {