X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4611dd06a1c5f016fd5b4c5384bbe4620f8af3e9..2d97237dac7f35e78f4a1ce1877dafc7b05ffb4f:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 6ad8ede7d6..8640396da0 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$ @@ -11,50 +11,48 @@ #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" #include "wx/palette.h" #include "wx/gdiobj.h" -#ifdef __WXGTK20__ -typedef struct _GdkPixbuf GdkPixbuf; -#endif +class WXDLLEXPORT wxPixelDataBase; //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxMask; -class wxBitmap; -class wxImage; +class WXDLLIMPEXP_CORE wxMask; +class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxImage; //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- -class wxMask: public wxObject +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(); - + 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) }; @@ -63,7 +61,7 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -71,21 +69,19 @@ public: 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 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; - + wxImage ConvertToImage() const; // copies the contents and mask of the given (colour) icon to the bitmap @@ -93,7 +89,7 @@ public: wxMask *GetMask() const; void SetMask( wxMask *mask ); - + wxBitmap GetSubBitmap( const wxRect& rect ) const; bool SaveFile(const wxString &name, wxBitmapType type, @@ -106,7 +102,7 @@ public: wxPalette *GetColourMap() const { return GetPalette(); }; #endif // wxUSE_PALETTE - static void InitStandardHandlers() { } + static void InitStandardHandlers(); // implementation // -------------- @@ -116,20 +112,21 @@ 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); @@ -139,22 +136,30 @@ private: 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) +}; + + #endif // __GTKBITMAPH__