X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97507ccea7da6ca3765aa3c56bc74b1db47ca557..af8481937288aa79f67b5e7df3caeef5a7824248:/include/wx/os2/gdiimage.h?ds=sidebyside diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index db980074f7..e808762642 100644 --- 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 @@ -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; }; // ---------------------------------------------------------------------------- @@ -127,6 +133,12 @@ public: ,int nDesiredWidth ,int nDesiredHeight ) = 0; + virtual bool Load( wxGDIImage* pImage + ,int nId + ,long lFlags + ,int nDesiredWidth + ,int nDesiredHeight + ) = 0; virtual bool Save( wxGDIImage* pImage ,const wxString& rName ,int lType @@ -136,7 +148,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 @@ -170,9 +182,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; } @@ -193,6 +219,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();