fixed wxImage->wxBitmap conversion for images with alpha channel

[wxWidgets.git] / include / wx / os2 / gdiimage.h

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 9ad840e3459806501b84dcafef5383eceb5cb9f8..422d3d4b05f584fe7b4d5976aa656c9c260b116f 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -7,7 +7,7 @@
 // Created:     20.11.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // NB: this is a private header, it is not intended to be directly included by
@@ -28,6 +28,8 @@ class WXDLLEXPORT wxGDIImageRefData;
 class WXDLLEXPORT wxGDIImageHandler;
 class WXDLLEXPORT wxGDIImage;
 
+WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
+
 // ----------------------------------------------------------------------------
 // wxGDIImageRefData: common data fields for all derived classes
 // ----------------------------------------------------------------------------
@@ -40,14 +42,15 @@ public:
         m_nWidth = m_nHeight = m_nDepth = 0;
 
         m_hHandle = 0;
-
-#if WXWIN_COMPATIBILITY_2
-        m_bOk = FALSE;
-#endif // WXWIN_COMPATIBILITY_2
     }
 
     // accessors
-    bool IsOk() const { return m_hHandle != 0; }
+    bool IsOk() const
+    {
+        if (m_hHandle == 0)
+            return FALSE;
+        return TRUE;
+    }
 
     void SetSize( int nW
                  ,int nH
@@ -55,7 +58,7 @@ public:
         { m_nWidth = nW; m_nHeight = nH; }
 
     // free the ressources we allocated
-    virtual void Free() = 0;
+    virtual void Free() { };
 
     // for compatibility, the member fields are public
 
@@ -75,13 +78,7 @@ public:
         WXHCURSOR                   m_hCursor;
     };
 
-    // this filed is redundant and using it is error prone but keep it for
-    // backwards compatibility
-#if WXWIN_COMPATIBILITY_2
-    void SetOk() { m_bOk = m_hHandle != 0; }
-
-    bool                            m_bOk;
-#endif // WXWIN_COMPATIBILITY_2
+    UINT                            m_uId;
 };
 
 // ----------------------------------------------------------------------------
@@ -122,6 +119,13 @@ public:
                        ) = 0;
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
+                      ,long            lFlags
+                      ,int             nDesiredWidth
+                      ,int             nDesiredHeight
+                     ) = 0;
+    virtual bool Load( wxGDIImage*     pImage
+                      ,int             nId
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
@@ -135,7 +139,7 @@ protected:
     wxString                        m_sName;
     wxString                        m_sExtension;
     long                            m_lType;
-};
+}; // end of wxGDIImageHandler
 
 // ----------------------------------------------------------------------------
 // wxGDIImage: this class supports GDI image handlers which may be registered
@@ -147,7 +151,7 @@ class WXDLLEXPORT wxGDIImage : public wxGDIObject
 {
 public:
     // handlers list interface
-    static wxList& GetHandlers() { return ms_handlers; }
+    static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; }
 
     static void AddHandler(wxGDIImageHandler* hHandler);
     static void InsertHandler(wxGDIImageHandler* hHandler);
@@ -169,9 +173,23 @@ public:
 
     // accessors
     WXHANDLE GetHandle() const
-        { return IsNull() ? 0 : GetGDIImageData()->m_hHandle; }
+    {
+        wxGDIImageRefData*               pData;
+
+        pData = GetGDIImageData();
+        if (!pData)
+            return 0;
+        else
+            return pData->m_hHandle;
+    }
     void SetHandle(WXHANDLE hHandle)
-        { EnsureHasData(); GetGDIImageData()->m_hHandle = hHandle; }
+    {
+        wxGDIImageRefData*               pData;
+
+        EnsureHasData();
+        pData = GetGDIImageData();
+        pData->m_hHandle = hHandle;
+    }
 
     bool Ok() const { return GetHandle() != 0; }
 
@@ -192,6 +210,24 @@ public:
     }
     void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
 
+    UINT GetId(void) const
+    {
+        wxGDIImageRefData*          pData;
+
+        pData = GetGDIImageData();
+        if (!pData)
+            return 0;
+        else
+            return pData->m_uId;
+    } // end of WxWinGdi_CGDIImage::GetId
+    void SetId(UINT uId)
+    {
+        wxGDIImageRefData*          pData;
+
+        EnsureHasData();
+        pData = GetGDIImageData();
+        pData->m_uId = uId;
+    }
     // forward some of base class virtuals to wxGDIImageRefData
     bool             FreeResource(bool bForce = FALSE);
     virtual WXHANDLE GetResourceHandle();
@@ -200,7 +236,7 @@ protected:
     // create the data for the derived class here
     virtual wxGDIImageRefData* CreateData() const = 0;
 
-    static wxList                   ms_handlers;
+    static wxGDIImageHandlerList    ms_handlers;
 };
 
 #endif // _WX_MSW_GDIIMAGE_H_