X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8bb6da4ae69b4b16982a1cf7a7284c44b98e4e21..213ceb3f0e7b88a09d756dd181f14ecb5bd44d57:/include/wx/os2/gdiimage.h?ds=inline diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 18a301cef5..422d3d4b05 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 @@ -28,6 +28,8 @@ class WXDLLEXPORT wxGDIImageRefData; class WXDLLEXPORT wxGDIImageHandler; class WXDLLEXPORT wxGDIImage; +WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList); + // ---------------------------------------------------------------------------- // wxGDIImageRefData: common data fields for all derived classes // ---------------------------------------------------------------------------- @@ -40,10 +42,6 @@ public: m_nWidth = m_nHeight = m_nDepth = 0; m_hHandle = 0; - -#if WXWIN_COMPATIBILITY_2 - m_bOk = FALSE; -#endif // WXWIN_COMPATIBILITY_2 } // accessors @@ -80,13 +78,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; }; @@ -133,6 +124,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 @@ -142,7 +139,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 @@ -154,7 +151,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); @@ -239,7 +236,7 @@ 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_