A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 9ad840e3459806501b84dcafef5383eceb5cb9f8..18a301cef519bb0056d4869a32bf380d73830d74 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -47,7 +47,12 @@ public:
     }
 
     // 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 +60,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
 
@@ -82,6 +87,7 @@ public:
 
     bool                            m_bOk;
 #endif // WXWIN_COMPATIBILITY_2
+    UINT                            m_uId;
 };
 
 // ----------------------------------------------------------------------------
@@ -122,6 +128,7 @@ public:
                        ) = 0;
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
@@ -169,9 +176,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 +213,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();