Fix part of [ 1570325 ] wxAnimationCtrl for wxAdv library

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

diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h
index 422d3d4b05f584fe7b4d5976aa656c9c260b116f..34c4c73d0d56be9485740ad69e35e0c86f7b99d7 100644 (file)
--- a/include/wx/os2/gdiimage.h
+++ b/include/wx/os2/gdiimage.h
@@ -16,10 +16,6 @@
 #ifndef _WX_OS2_GDIIMAGE_H_
 #define _WX_OS2_GDIIMAGE_H_
 
 #ifndef _WX_OS2_GDIIMAGE_H_
 #define _WX_OS2_GDIIMAGE_H_
 

-#ifdef __GNUG__
-    #pragma interface "gdiimage.h"
-#endif
-

 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"
 #include "wx/gdiobj.h"          // base class
 #include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
 #include "wx/list.h"


@@ -111,7 +107,7 @@ public:
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage
 
     // real handler operations: to implement in derived classes
     virtual bool Create( wxGDIImage* pImage

-                        ,void*       pData
+                        ,const void* pData

                         ,long        lFlags
                         ,int         nWidth
                         ,int         nHeight
                         ,long        lFlags
                         ,int         nWidth
                         ,int         nHeight


@@ -191,7 +187,8 @@ public:
         pData->m_hHandle = hHandle;
     }
 
         pData->m_hHandle = hHandle;
     }
 

-    bool Ok() const { return GetHandle() != 0; }
+    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 GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
     int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }