X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/258f5b3ec3bc1b2c5f3e4037a1599bed04613108..1b88201ff5f0f9ed18db555b70eb7123c8a7c9c6:/include/wx/os2/gdiimage.h diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 422d3d4b05..34c4c73d0d 100644 --- 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_ -#ifdef __GNUG__ - #pragma interface "gdiimage.h" -#endif - #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 - ,void* pData + ,const void* pData ,long lFlags ,int nWidth ,int nHeight @@ -191,7 +187,8 @@ public: 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; }