X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3cb6592e97f338d6546d42588e9af7cbb8e1bd0..3cbe51d09405849cc89b185b90aaa8880365e3dd:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 7baf8849f3..8449a01cdb 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -2,9 +2,8 @@ // Name: bitmap.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,6 +19,7 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/palette.h" +#include "wx/gdiobj.h" //----------------------------------------------------------------------------- // classes @@ -34,44 +34,40 @@ 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: - - GdkBitmap *m_bitmap; - + +private: + DECLARE_DYNAMIC_CLASS(wxMask) }; //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -// CMB 20/5/98: added xbm constructor and GetBitmap() method -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 char **bits ); wxBitmap( 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(); wxBitmap& operator = ( const wxBitmap& bmp ); bool operator == ( const wxBitmap& bmp ); @@ -81,32 +77,30 @@ class wxBitmap: public wxObject 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 ); - void Resize( int height, int width ); - 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 + { return GetPalette(); }; - GdkPixmap *GetPixmap() const; - GdkBitmap *GetBitmap() const; + // implementation + // -------------- - void DestroyImage(); - void RecreateImage(); - void Render(); + void SetHeight( int height ); + void SetWidth( int width ); + void SetDepth( int depth ); + void SetPixmap( GdkPixmap *pixmap ); - // no data :-) + GdkPixmap *GetPixmap() const; + GdkBitmap *GetBitmap() const; + +private: + DECLARE_DYNAMIC_CLASS(wxBitmap) }; #endif // __GTKBITMAPH__