#include "wx/palette.h"
#include "wx/gdiobj.h"
-class WXDLLEXPORT wxPixelDataBase;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
//-----------------------------------------------------------------------------
// 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
wxBitmap( int width, int height, int depth = -1 );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
-#if defined (__GNUC__) && __GNUC__ < 3
+#ifdef wxNEEDS_CHARPP
// needed for old GCC
wxBitmap(char** data)
{
- *this = wxBitmap(wx_const_cast(const char* const*, data));
+ *this = wxBitmap(const_cast<const char* const*>(data));
}
#endif
- wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+ wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
virtual ~wxBitmap();
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
bool Create(int width, int height, int depth = -1);
- int GetHeight() const;
- int GetWidth() const;
- int GetDepth() const;
+ virtual int GetHeight() const;
+ virtual int GetWidth() const;
+ virtual int GetDepth() const;
wxImage ConvertToImage() 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);
#if wxUSE_PALETTE
wxPalette *GetPalette() const;
void UngetRawData(wxPixelDataBase& data);
bool HasAlpha() const;
- void UseAlpha();
protected:
bool CreateFromImage(const wxImage& image, int depth);
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
private:
// to be called from CreateFromImage only!
bool CreateFromImageAsBitmap(const wxImage& image);
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
#endif // __GTKBITMAPH__