X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..2d9c0e97c580cff977d75760dc0d82c5852eec2c:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 15af99d2c5..25b7778b1c 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -11,7 +11,7 @@ #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -19,7 +19,7 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/palette.h" -#include "wx/image.h" +#include "wx/gdiobj.h" //----------------------------------------------------------------------------- // classes @@ -27,6 +27,7 @@ class wxMask; class wxBitmap; +class wxImage; //----------------------------------------------------------------------------- // wxMask @@ -34,77 +35,90 @@ class wxBitmap; class wxMask: public wxObject { - DECLARE_DYNAMIC_CLASS(wxMask) - - public: - +public: wxMask(); wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap ); ~wxMask(); + + bool Create( const wxBitmap& bitmap, const wxColour& colour ); + bool Create( const wxBitmap& bitmap, int paletteIndex ); + bool Create( const wxBitmap& bitmap ); - // implementation + // implementation + GdkBitmap *m_bitmap; GdkBitmap *GetBitmap() const; - - protected: - friend wxBitmap; - - GdkBitmap *m_bitmap; - +private: + DECLARE_DYNAMIC_CLASS(wxMask) }; //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxObject +class wxBitmap: public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxBitmap) - - public: - +public: wxBitmap(); wxBitmap( int width, int height, int depth = -1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const wxImage &image ); - wxBitmap( char **bits ); + wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); } + wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( const wxBitmap& bmp ); - wxBitmap( const wxBitmap* bmp ); - wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM); + wxBitmap( const wxString &filename, int 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 ); - bool operator != ( const wxBitmap& bmp ); + bool operator == ( const wxBitmap& bmp ) const; + bool operator != ( const wxBitmap& bmp ) const; bool Ok() const; - - wxImage ConvertToImage() const; + bool Create(int width, int height, int depth = -1); + int GetHeight() const; int GetWidth() const; int GetDepth() const; - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); + + wxImage ConvertToImage() const; + + // copies the contents and mask of the given (colour) icon to the bitmap + virtual bool CopyFromIcon(const wxIcon& icon); wxMask *GetMask() const; void SetMask( wxMask *mask ); + + wxBitmap GetSubBitmap( const wxRect& rect ) const; bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL ); - bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM); + bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM ); wxPalette *GetPalette() const; - wxPalette *GetColourMap() const - { return GetPalette(); }; - - // implementation + wxPalette *GetColourMap() const { return GetPalette(); }; + + static void InitStandardHandlers() { } + static void CleanUpHandlers() { } + + // implementation + // -------------- + + void SetHeight( int height ); + void SetWidth( int width ); + void SetDepth( int depth ); + void SetPixmap( GdkPixmap *pixmap ); + void SetBitmap( GdkBitmap *bitmap ); GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const; + +protected: + bool CreateFromXpm(const char **bits); + bool CreateFromImage(const wxImage& image, int depth); - // no data :-) +private: + DECLARE_DYNAMIC_CLASS(wxBitmap) }; #endif // __GTKBITMAPH__