X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..9b49405777342458dc1666001865eef7309b6c30:/include/wx/gtk/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index bb60fc43e6..96f3e23814 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 @@ -51,24 +51,35 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() { } - wxBitmap( int width, int height, int depth = -1 ); + wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(width, height, depth); } + wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(sz, depth); } wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char* const* bits ); - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); - wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } +#ifdef wxNEEDS_CHARPP + // needed for old GCC + wxBitmap(char** data) + { *this = wxBitmap(const_cast(data)); } +#endif + wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); +#if wxUSE_IMAGE + wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH ) + { (void)CreateFromImage(image, depth); } +#endif // wxUSE_IMAGE virtual ~wxBitmap(); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); } - bool Ok() const { return IsOk(); } - bool IsOk() const; - bool Create(int width, int height, int depth = -1); + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - int GetHeight() const; - int GetWidth() const; - int GetDepth() const; + virtual int GetHeight() const; + virtual int GetWidth() const; + virtual 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); @@ -79,8 +90,8 @@ public: wxBitmap GetSubBitmap( const wxRect& rect ) const; bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = (wxPalette *)NULL) const; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM ); + const wxPalette *palette = NULL) const; + bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); #if wxUSE_PALETTE wxPalette *GetPalette() const; @@ -104,24 +115,29 @@ public: bool HasPixbuf() const; GdkPixbuf *GetPixbuf() const; - // Basically, this corresponds to Win32 StretchBlt() - 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: +#if wxUSE_IMAGE bool CreateFromImage(const wxImage& image, int depth); +#endif // wxUSE_IMAGE + + virtual wxGDIRefData* CreateGDIRefData() const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* 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, @@ -131,20 +147,8 @@ 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) }; -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; - #endif // _WX_GTK_BITMAP_H_