X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..1deef99727c57b21976be81a14312f001fededb4:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 5ecc5920ee..633f2157cd 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -78,14 +78,12 @@ public: wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } virtual ~wxBitmap(); - bool Ok() const { return IsOk(); } - bool IsOk() const; bool Create(int width, int height, int depth = -1); - int GetHeight() const; - int GetWidth() const; - int GetDepth() const; + virtual int GetHeight() const; + virtual int GetWidth() const; + virtual int GetDepth() const; wxImage ConvertToImage() const; @@ -130,13 +128,12 @@ public: void UngetRawData(wxPixelDataBase& data); bool HasAlpha() const; - void UseAlpha(); protected: bool CreateFromImage(const wxImage& image, int depth); - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: // to be called from CreateFromImage only! @@ -149,13 +146,5 @@ private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; #endif // __GTKBITMAPH__