{
public:
wxBitmap() { }
- wxBitmap( int width, int height, int depth = -1 );
+ wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH );
wxBitmap( const char bits[], int width, int height, int depth = 1 );
wxBitmap( const char* const* bits );
#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 );
#if wxUSE_IMAGE
- wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
+ wxBitmap( const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH )
+ { (void)CreateFromImage(image, depth); }
#endif // wxUSE_IMAGE
virtual ~wxBitmap();
- bool Ok() const { return IsOk(); }
- bool IsOk() const;
- bool Create(int width, int height, int depth = -1);
+ bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
- int GetHeight() const;
- int GetWidth() const;
- int GetDepth() const;
+ virtual int GetHeight() const;
+ virtual int GetWidth() const;
+ virtual int GetDepth() const;
#if wxUSE_IMAGE
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;
GdkPixbuf *GetPixbuf() const;
// Basically, this corresponds to Win32 StretchBlt()
- wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight, int width, int height) const;
+ wxBitmap Rescale(int clipx, int clipy, int clipwidth, int clipheight,
+ int width, int height) const;
// raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp);
bool CreateFromImage(const wxImage& image, int depth);
#endif // wxUSE_IMAGE
- virtual wxObjectRefData* CreateRefData() const;
- virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+ virtual wxGDIRefData* CreateGDIRefData() const;
+ virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
private:
#if wxUSE_IMAGE
DECLARE_DYNAMIC_CLASS(wxBitmap)
};
-//-----------------------------------------------------------------------------
-// wxBitmapHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
- DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-
#endif // _WX_GTK_BITMAP_H_