X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 21d6bcd286..98bc4a8bee 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -11,7 +11,7 @@ #define _WX_GTK_BITMAP_H_ typedef struct _GdkPixbuf GdkPixbuf; -class WXDLLEXPORT wxPixelDataBase; +class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; //----------------------------------------------------------------------------- // wxMask @@ -50,17 +50,24 @@ private: class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap(); + wxBitmap() { } wxBitmap( int width, int height, int depth = -1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); } - wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } + wxBitmap( const char* const* bits ); +#ifdef wxNEEDS_CHARPP + // needed for old GCC + wxBitmap(char** data) + { + *this = wxBitmap(wx_const_cast(const char* const*, data)); + } +#endif wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); +#if wxUSE_IMAGE wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } +#endif // wxUSE_IMAGE virtual ~wxBitmap(); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const; - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; bool Create(int width, int height, int depth = -1); @@ -68,7 +75,9 @@ public: int GetWidth() const; int GetDepth() const; +#if wxUSE_IMAGE wxImage ConvertToImage() const; +#endif // wxUSE_IMAGE // copies the contents and mask of the given (colour) icon to the bitmap virtual bool CopyFromIcon(const wxIcon& icon); @@ -97,7 +106,7 @@ public: void SetWidth( int width ); void SetDepth( int depth ); void SetPixmap( GdkPixmap *pixmap ); - void SetPixbuf(GdkPixbuf *pixbuf); + void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0); GdkPixmap *GetPixmap() const; bool HasPixmap() const; @@ -105,24 +114,31 @@ public: GdkPixbuf *GetPixbuf() const; // Basically, this corresponds to Win32 StretchBlt() - wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); + wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight, int width, int height) const; // raw bitmap access support functions void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); bool HasAlpha() const; - void UseAlpha(); protected: - bool CreateFromXpm(const char **bits); +#if wxUSE_IMAGE bool CreateFromImage(const wxImage& image, int depth); +#endif // wxUSE_IMAGE + + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; private: +#if wxUSE_IMAGE // to be called from CreateFromImage only! bool CreateFromImageAsPixmap(const wxImage& image, int depth); bool CreateFromImageAsPixbuf(const wxImage& image); +#endif // wxUSE_IMAGE +public: + // implementation only enum Representation { Pixmap, @@ -132,9 +148,6 @@ private: // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): void PurgeOtherRepresentations(Representation keep); - friend class wxMemoryDC; - friend class wxBitmapHandler; - private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; @@ -145,17 +158,7 @@ private: class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { -public: - wxBitmapHandler() { } - virtual ~wxBitmapHandler(); - - virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1); - virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight); - virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL); - -private: - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) + DECLARE_ABSTRACT_CLASS(wxBitmapHandler) }; #endif // _WX_GTK_BITMAP_H_