X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/os2/gdiimage.h

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index b2f68d5ff0..8b5625abdf 100644
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/os2/gdiimage.h
+// Name:        wx/os2/gdiimage.h
 // Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
 //              under OS/2
 // Author:      David Webster (adapted from msw version by Vadim Zeitlin)
@@ -20,9 +20,9 @@
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"
 
-class WXDLLEXPORT wxGDIImageRefData;
-class WXDLLEXPORT wxGDIImageHandler;
-class WXDLLEXPORT wxGDIImage;
+class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData;
+class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler;
+class WXDLLIMPEXP_FWD_CORE wxGDIImage;
 
 WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
 
@@ -30,7 +30,7 @@ WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImageRefData : public wxGDIRefData
+class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData
 {
 public:
     wxGDIImageRefData()
@@ -41,11 +41,11 @@ public:
     }
 
     // accessors
-    bool IsOk() const
+    virtual bool IsOk() const
     {
         if (m_hHandle == 0)
-            return FALSE;
-        return TRUE;
+            return false;
+        return true;
     }
 
     void SetSize( int nW
@@ -74,21 +74,21 @@ public:
         WXHCURSOR                   m_hCursor;
     };
 
-    UINT                            m_uId;
+    unsigned int                    m_uId;
 };
 
 // ----------------------------------------------------------------------------
 // wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImageHandler : public wxObject
+class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject
 {
 public:
     // ctor
     wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; }
     wxGDIImageHandler( const wxString& rName
                       ,const wxString& rExt
-                      ,long            lType
+                      ,wxBitmapType    lType
                      )
                      : m_sName(rName)
                      , m_sExtension(rExt)
@@ -99,16 +99,16 @@ public:
     // accessors
     void SetName(const wxString& rName) { m_sName = rName; }
     void SetExtension(const wxString& rExt) { m_sExtension = rExt; }
-    void SetType(long lType) { m_lType = lType; }
+    void SetType(wxBitmapType lType) { m_lType = lType; }
 
     wxString GetName() const { return m_sName; }
     wxString GetExtension() const { return m_sExtension; }
-    long GetType() const { return m_lType; }
+    wxBitmapType GetType() const { return m_lType; }
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage
-                        ,void*       pData
-                        ,long        lFlags
+                        ,const void* pData
+                        ,wxBitmapType lFlags
                         ,int         nWidth
                         ,int         nHeight
                         ,int         nDepth = 1
@@ -116,25 +116,25 @@ public:
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                       ,HPS             hPs
-                      ,long            lFlags
+                      ,wxBitmapType    lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;
     virtual bool Load( wxGDIImage*     pImage
                       ,int             nId
-                      ,long            lFlags
+                      ,wxBitmapType    lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                      ) = 0;
-    virtual bool Save( wxGDIImage*     pImage
-                      ,const wxString& rName
-                      ,int             lType
-                     ) = 0;
+    virtual bool Save( const wxGDIImage* pImage
+                      ,const wxString&   rName
+                      ,wxBitmapType      lType
+                     ) const = 0;
 
 protected:
     wxString                        m_sName;
     wxString                        m_sExtension;
-    long                            m_lType;
+    wxBitmapType                    m_lType;
 }; // end of wxGDIImageHandler
 
 // ----------------------------------------------------------------------------
@@ -143,7 +143,7 @@ protected:
 // format. It also falls back to wxImage if no appropriate image is found.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGDIImage : public wxGDIObject
+class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
@@ -154,8 +154,8 @@ public:
     static bool RemoveHandler(const wxString& rName);
 
     static wxGDIImageHandler* FindHandler(const wxString& rName);
-    static wxGDIImageHandler* FindHandler(const wxString& rExtension, long lType);
-    static wxGDIImageHandler* FindHandler(long lType);
+    static wxGDIImageHandler* FindHandler(const wxString& rExtension, wxBitmapType lType);
+    static wxGDIImageHandler* FindHandler(wxBitmapType lType);
 
     static void InitStandardHandlers();
     static void CleanUpHandlers();
@@ -187,9 +187,6 @@ public:
         pData->m_hHandle = hHandle;
     }
 
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return GetHandle() != 0; }
-
     int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }
     int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; }
@@ -207,7 +204,7 @@ public:
     }
     void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
 
-    UINT GetId(void) const
+    unsigned int GetId(void) const
     {
         wxGDIImageRefData*          pData;
 
@@ -217,7 +214,7 @@ public:
         else
             return pData->m_uId;
     } // end of WxWinGdi_CGDIImage::GetId
-    void SetId(UINT uId)
+    void SetId(unsigned int uId)
     {
         wxGDIImageRefData*          pData;
 
@@ -226,12 +223,22 @@ public:
         pData->m_uId = uId;
     }
     // forward some of base class virtuals to wxGDIImageRefData
-    bool             FreeResource(bool bForce = FALSE);
-    virtual WXHANDLE GetResourceHandle();
+    bool             FreeResource(bool bForce = false);
+    virtual WXHANDLE GetResourceHandle() const;
 
 protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData* CreateData() const = 0;
+    virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); }
+
+    // we can't [efficiently] clone objects of this class
+    virtual wxGDIRefData *
+    CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
+    {
+        wxFAIL_MSG( _T("must be implemented if used") );
+
+        return NULL;
+    }
 
     static wxGDIImageHandlerList    ms_handlers;
 };