X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..b225f65995e9eccefe9b502568b1b8e40629cd1a:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 1d6260c5fc..3de0323615 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -2,10 +2,9 @@ // Name: bitmap.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// RCS-ID: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -20,18 +19,15 @@ #include "wx/object.h" #include "wx/string.h" #include "wx/palette.h" +#include "wx/gdiobj.h" //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxMemoryDC; -class wxToolBarGTK; - class wxMask; class wxBitmap; +class wxImage; //----------------------------------------------------------------------------- // wxMask @@ -39,80 +35,88 @@ class wxBitmap; class wxMask: public wxObject { - DECLARE_DYNAMIC_CLASS(wxMask) - - public: - - wxMask(void); +public: + wxMask(); wxMask( const wxBitmap& bitmap, const wxColour& colour ); - wxMask( const wxBitmap& bitmap, const int paletteIndex ); + wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap ); - ~wxMask(void); - - private: + ~wxMask(); - friend wxBitmap; - friend wxDC; - friend wxPaintDC; - friend wxToolBarGTK; - - GdkBitmap *GetBitmap(void) const; + bool Create( const wxBitmap& bitmap, const wxColour& colour ); + bool Create( const wxBitmap& bitmap, int paletteIndex ); + bool Create( const wxBitmap& bitmap ); + + // implementation + GdkBitmap *m_bitmap; - protected: + GdkBitmap *GetBitmap() const; - GdkBitmap *m_bitmap; - +private: + DECLARE_DYNAMIC_CLASS(wxMask) }; //----------------------------------------------------------------------------- // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxObject +class wxBitmap: public wxGDIObject { - DECLARE_DYNAMIC_CLASS(wxBitmap) - - public: - - wxBitmap(void); - wxBitmap( const int width, const int height, const int depth = -1 ); - wxBitmap( char **bits ); +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 ) { (void)CreateFromXpm(bits); } + wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); } wxBitmap( const wxBitmap& bmp ); - wxBitmap( const wxBitmap* bmp ); - wxBitmap( const wxString &filename, const int type ); - ~wxBitmap(void); + 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 Ok(void) const; + 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(void) const; - int GetWidth(void) const; - int GetDepth(void) const; - void SetHeight( const int height ); - void SetWidth( const int width ); - void SetDepth( const int depth ); - - wxMask *GetMask(void) const; + 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 + virtual bool CopyFromIcon(const wxIcon& icon); + + wxMask *GetMask() const; void SetMask( wxMask *mask ); - bool SaveFile( const wxString &name, const int type, wxPalette *palette = NULL ); - bool LoadFile( const wxString &name, const int type ); - - wxPalette *GetPalette(void) const; - wxPalette *GetColourMap(void) const - { return GetPalette(); }; - - private: - - friend wxDC; - friend wxPaintDC; - friend wxMemoryDC; - friend wxToolBarGTK; + 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 ); - GdkPixmap *GetPixmap(void) const; + wxPalette *GetPalette() const; + wxPalette *GetColourMap() const + { return GetPalette(); }; + + // 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; - // no data :-) +protected: + bool CreateFromXpm(const char **bits); + bool CreateFromImage(const wxImage& image, int depth); + +private: + DECLARE_DYNAMIC_CLASS(wxBitmap) }; #endif // __GTKBITMAPH__