X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/219f895a273cdf12ded3f79dbbcd1e076fe83901..8dc9904630c28707c828328e997ec46639aca757:/include/wx/gtk1/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 94795def8e..37c42b14c5 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 // RCS-ID: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -25,13 +24,6 @@ // classes //----------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxMemoryDC; -class wxToolBarGTK; -class wxBitmapButton; -class wxStaticBitmap; - class wxMask; class wxBitmap; @@ -41,93 +33,74 @@ 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, int paletteIndex ); wxMask( const wxBitmap& bitmap ); - ~wxMask(void); - - private: + ~wxMask(); - friend wxBitmap; - friend wxDC; - friend wxPaintDC; - friend wxToolBarGTK; - friend wxBitmapButton; - friend wxStaticBitmap; - - 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 //----------------------------------------------------------------------------- -// CMB 20/5/98: added xbm constructor and GetBitmap() method class wxBitmap: public wxObject { - DECLARE_DYNAMIC_CLASS(wxBitmap) - - public: - - wxBitmap(void); +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(void); + 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(void) const; - - int GetHeight(void) const; - int GetWidth(void) const; - int GetDepth(void) const; + bool Ok() const; + + int GetHeight() const; + int GetWidth() const; + int GetDepth() const; + + wxMask *GetMask() const; + void SetMask( wxMask *mask ); + + bool SaveFile( const wxString &name, int type, wxPalette *palette = (wxPalette *) NULL ); + bool LoadFile( const wxString &name, int type = wxBITMAP_TYPE_XPM ); + + 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 ); - wxMask *GetMask(void) const; - void SetMask( wxMask *mask ); - - void Resize( int height, int width ); - - bool SaveFile( const wxString &name, int type, wxPalette *palette = NULL ); - bool LoadFile( const wxString &name, int type ); - - wxPalette *GetPalette(void) const; - wxPalette *GetColourMap(void) const - { return GetPalette(); }; + GdkPixmap *GetPixmap() const; + GdkBitmap *GetBitmap() const; - private: - - friend wxDC; - friend wxPaintDC; - friend wxMemoryDC; - friend wxToolBarGTK; - friend wxBitmapButton; - friend wxStaticBitmap; - - GdkPixmap *GetPixmap(void) const; - GdkBitmap *GetBitmap(void) const; - - void DestroyImage(void); - void RecreateImage(void); - void Render(void); - // no data :-) + +private: + DECLARE_DYNAMIC_CLASS(wxBitmap) }; #endif // __GTKBITMAPH__