X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd7f2a6c52cb5535a021dfcdc83f4ba8b37dbce1..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index b14cb20955..0e5b85c9d7 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -2,17 +2,16 @@ // 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 ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -20,24 +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 wxToolBar; -class wxBitmapButton; -class wxStaticBitmap; -class wxFrame; -class wxDialog; -class wxTreeCtrl; -class wxNotebook; - class wxMask; class wxBitmap; +class wxImage; //----------------------------------------------------------------------------- // wxMask @@ -45,100 +35,88 @@ 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 ); - private: - - friend wxBitmap; - friend wxDC; - friend wxPaintDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; - friend wxFrame; - friend wxDialog; - friend wxTreeCtrl; - friend wxNotebook; - + // 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( 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; + 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 ); - - void Resize( int height, int width ); + + 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(); }; + { return GetPalette(); }; - private: + // implementation + // -------------- - friend wxDC; - friend wxPaintDC; - friend wxMemoryDC; - friend wxToolBar; - friend wxBitmapButton; - friend wxStaticBitmap; - friend wxFrame; - friend wxDialog; - friend wxTreeCtrl; + 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; - - void DestroyImage(); - void RecreateImage(); - void Render(); + +protected: + bool CreateFromXpm(const char **bits); + bool CreateFromImage(const wxImage& image, int depth); - // no data :-) +private: + DECLARE_DYNAMIC_CLASS(wxBitmap) }; #endif // __GTKBITMAPH__