X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c79a329dcba198c0d8964aaaba3bd6fe114a7d34..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 55043f8cb1..6ae61b96c2 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.h +// Name: x11/bitmap.h // Purpose: wxBitmap class // Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#ifdef __GNUG__ -#pragma interface "bitmap.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -26,23 +22,24 @@ // classes //----------------------------------------------------------------------------- -class wxMask; -class wxBitmap; -class wxImage; +class WXDLLIMPEXP_FWD_CORE wxMask; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxImage; //----------------------------------------------------------------------------- // wxMask //----------------------------------------------------------------------------- -class wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxObject { public: wxMask(); + wxMask(const wxMask& mask); wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap ); - ~wxMask(); - + virtual ~wxMask(); + bool Create( const wxBitmap& bitmap, const wxColour& colour ); bool Create( const wxBitmap& bitmap, int paletteIndex ); bool Create( const wxBitmap& bitmap ); @@ -50,14 +47,15 @@ public: // implementation WXPixmap GetBitmap() const { return m_bitmap; } void SetBitmap( WXPixmap bitmap ) { m_bitmap = bitmap; } - + WXDisplay *GetDisplay() const { return m_display; } void SetDisplay( WXDisplay *display ) { m_display = display; } - + private: WXPixmap m_bitmap; WXDisplay *m_display; - + wxSize m_size; + private: DECLARE_DYNAMIC_CLASS(wxMask) }; @@ -66,45 +64,61 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxGDIObject +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap(); - wxBitmap( int width, int height, int depth = -1 ); + wxBitmap() {} + wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } + wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } + 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 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 ) const; - bool operator != ( const wxBitmap& bmp ) const; - bool Ok() const; - - bool Create(int width, int height, int depth = -1); - + wxBitmap( const char* const* bits ); +#ifdef wxNEEDS_CHARPP + // needed for old GCC + wxBitmap(char** data) + { + *this = wxBitmap(const_cast(data)); + } +#endif + wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); + virtual ~wxBitmap(); + + static void InitStandardHandlers(); + + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } + + bool Create(const void* data, wxBitmapType type, + int width, int height, int depth = -1); + // create the wxBitmap using a _copy_ of the pixmap + bool Create(WXPixmap pixmap); + int GetHeight() const; int GetWidth() const; int GetDepth() const; - + +#if wxUSE_IMAGE + wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } wxImage ConvertToImage() const; + bool CreateFromImage(const wxImage& image, int depth = -1); +#endif // wxUSE_IMAGE // 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 ); - + 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 SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const; + bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); wxPalette *GetPalette() const; wxPalette *GetColourMap() const { return GetPalette(); }; + virtual void SetPalette(const wxPalette& palette); // implementation // -------------- @@ -117,16 +131,17 @@ public: WXPixmap GetPixmap() const; WXPixmap GetBitmap() const; - + + WXPixmap GetDrawable() const; + WXDisplay *GetDisplay() const; - + protected: - bool CreateFromXpm(const char **bits); - bool CreateFromImage(const wxImage& image, int depth = -1); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -#endif -// _WX_BITMAP_H_ +#endif // _WX_BITMAP_H_