X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/x11/bitmap.h?ds=inline diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index c7a746e2e7..6ae61b96c2 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -12,10 +12,6 @@ #ifndef _WX_BITMAP_H_ #define _WX_BITMAP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "bitmap.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -26,22 +22,23 @@ // 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 ); @@ -57,6 +54,7 @@ public: private: WXPixmap m_bitmap; WXDisplay *m_display; + wxSize m_size; private: DECLARE_DYNAMIC_CLASS(wxMask) @@ -66,35 +64,32 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmapHandler() : wxBitmapHandlerBase() {} -private: - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; + wxBitmap() {} + wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } + wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } -class wxBitmap: public wxBitmapBase -{ -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 wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); + 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(); - wxBitmap& operator = ( const wxBitmap& bmp ); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const; - bool Ok() const; - static void InitStandardHandlers(); - bool Create(int width, int height, int depth = -1); - bool Create(void* data, wxBitmapType type, + 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); @@ -117,8 +112,8 @@ public: wxBitmap GetSubBitmap( const wxRect& rect ) const; - bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const; - bool LoadFile( const wxString &name, wxBitmapType 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 @@ -142,11 +137,11 @@ public: WXDisplay *GetDisplay() const; protected: - bool CreateFromXpm(const char **bits); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -#endif -// _WX_BITMAP_H_ +#endif // _WX_BITMAP_H_