// classes
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxMask;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;
//-----------------------------------------------------------------------------
// wxMask
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 );
// wxBitmap
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase
-{
-public:
- wxBitmapHandler() : wxBitmapHandlerBase() {}
-private:
- DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-};
-
class WXDLLIMPEXP_CORE 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(wx_const_cast(const char* const*, 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(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);
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 LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
wxPalette *GetPalette() const;
wxPalette *GetColourMap() const
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_