X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/os2/gdiimage.h diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index e808762642..7269022b2b 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) @@ -16,17 +16,15 @@ #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" -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); // ---------------------------------------------------------------------------- // wxGDIImageRefData: common data fields for all derived classes @@ -40,18 +38,14 @@ 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 { if (m_hHandle == 0) - return FALSE; - return TRUE; + return false; + return true; } void SetSize( int nW @@ -80,13 +74,6 @@ 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; }; @@ -120,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 @@ -160,7 +147,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); @@ -200,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; } @@ -238,14 +226,14 @@ 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; - static wxList ms_handlers; + static wxGDIImageHandlerList ms_handlers; }; #endif // _WX_MSW_GDIIMAGE_H_