X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..9b49405777342458dc1666001865eef7309b6c30:/include/wx/gtk1/bitmap.h?ds=inline diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index d33ce22cc1..14f94a6664 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.h +// Name: wx/gtk1/bitmap.h // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ @@ -17,19 +17,15 @@ #include "wx/palette.h" #include "wx/gdiobj.h" -#ifdef __WXGTK20__ -typedef struct _GdkPixbuf GdkPixbuf; -#endif - -class WXDLLEXPORT wxPixelDataBase; +class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; //----------------------------------------------------------------------------- // 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 @@ -40,19 +36,23 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject public: wxMask(); wxMask( const wxBitmap& bitmap, const wxColour& colour ); +#if wxUSE_PALETTE wxMask( const wxBitmap& bitmap, int paletteIndex ); +#endif // wxUSE_PALETTE wxMask( const wxBitmap& bitmap ); - ~wxMask(); - + virtual ~wxMask(); + bool Create( const wxBitmap& bitmap, const wxColour& colour ); +#if wxUSE_PALETTE bool Create( const wxBitmap& bitmap, int paletteIndex ); +#endif // wxUSE_PALETTE bool Create( const wxBitmap& bitmap ); // implementation GdkBitmap *m_bitmap; - + GdkBitmap *GetBitmap() const; - + private: DECLARE_DYNAMIC_CLASS(wxMask) }; @@ -64,26 +64,30 @@ private: class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap(); - wxBitmap( int width, int height, int depth = -1 ); + wxBitmap() {} + wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } + wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } 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 wxBitmap& bmp ); - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); + wxBitmap( const char* const* bits ); +#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 ); wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } - ~wxBitmap(); - wxBitmap& operator = ( const wxBitmap& bmp ); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const; - bool Ok() const; - - bool Create(int width, int height, int depth = -1); - - int GetHeight() const; - int GetWidth() const; - int GetDepth() const; - + virtual ~wxBitmap(); + + 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); } + + virtual int GetHeight() const; + virtual int GetWidth() const; + virtual int GetDepth() const; + wxImage ConvertToImage() const; // copies the contents and mask of the given (colour) icon to the bitmap @@ -91,12 +95,12 @@ public: wxMask *GetMask() const; void SetMask( wxMask *mask ); - + 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; @@ -114,74 +118,35 @@ public: void SetDepth( int depth ); void SetPixmap( GdkPixmap *pixmap ); void SetBitmap( GdkBitmap *bitmap ); -#ifdef __WXGTK20__ - void SetPixbuf(GdkPixbuf *pixbuf); -#endif GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const; bool HasPixmap() const; -#ifdef __WXGTK20__ - bool HasPixbuf() const; - GdkPixbuf *GetPixbuf() const; -#endif - + // Basically, this corresponds to Win32 StretchBlt() wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); - + // 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); bool CreateFromImage(const wxImage& image, int depth); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + private: // to be called from CreateFromImage only! bool CreateFromImageAsBitmap(const wxImage& image); bool CreateFromImageAsPixmap(const wxImage& image); -#ifdef __WXGTK20__ - bool CreateFromImageAsPixbuf(const wxImage& image); - - enum Representation - { - Pixmap, - Pixbuf - }; - // removes other representations from memory, keeping only 'keep' - // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): - void PurgeOtherRepresentations(Representation keep); - - friend class wxMemoryDC; -#endif friend class wxBitmapHandler; -private: - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; - -//----------------------------------------------------------------------------- -// wxBitmapHandler -//----------------------------------------------------------------------------- - -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_DYNAMIC_CLASS(wxBitmap) };