X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e52f60e65236befe1a509cc3c1823607be0d2b3c..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 35d5c3008a..61245d92c1 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -19,7 +19,6 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/palette.h" -#include "wx/image.h" //----------------------------------------------------------------------------- // classes @@ -44,7 +43,7 @@ public: ~wxMask(); // implementation - + GdkBitmap *m_bitmap; GdkBitmap *GetBitmap() const; }; @@ -61,26 +60,19 @@ 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( const char **bits ); wxBitmap( char **bits ); wxBitmap( const wxBitmap& bmp ); - wxBitmap( const wxBitmap* bmp ); wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM ); ~wxBitmap(); wxBitmap& operator = ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp ); bool operator != ( const wxBitmap& bmp ); bool Ok() const; - - wxImage ConvertToImage() const; int GetHeight() const; int GetWidth() const; int GetDepth() const; - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); wxMask *GetMask() const; void SetMask( wxMask *mask ); @@ -91,8 +83,13 @@ public: wxPalette *GetPalette() const; wxPalette *GetColourMap() const { return GetPalette(); }; - -// implementation + +// implementation + + void SetHeight( int height ); + void SetWidth( int width ); + void SetDepth( int depth ); + void SetPixmap( GdkPixmap *pixmap ); GdkPixmap *GetPixmap() const; GdkBitmap *GetBitmap() const;