X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/459f812badc752b14c96ea294442c50390ee5030..2ef989c972df0bd023ec3b7252fb91afca55f8ab:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 84e7f3ebc0..29572c4870 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -22,9 +22,9 @@ // classes //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMask; -class WXDLLIMPEXP_CORE wxBitmap; -class WXDLLIMPEXP_CORE wxImage; +class WXDLLIMPEXP_FWD_CORE wxMask; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxImage; //----------------------------------------------------------------------------- // wxMask @@ -84,9 +84,6 @@ public: wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); virtual ~wxBitmap(); - bool Ok() const { return IsOk(); } - bool IsOk() const; - static void InitStandardHandlers(); bool Create(int width, int height, int depth = -1); @@ -138,8 +135,8 @@ public: WXDisplay *GetDisplay() const; protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxBitmap)