// wxMask
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxMaskBase
{
public:
wxMask();
+ wxMask(const wxMask& mask);
wxMask( const wxBitmap& bitmap, const wxColour& colour );
#if wxUSE_PALETTE
wxMask( const wxBitmap& bitmap, int paletteIndex );
wxMask( const wxBitmap& bitmap );
virtual ~wxMask();
- bool Create( const wxBitmap& bitmap, const wxColour& colour );
-#if wxUSE_PALETTE
- bool Create( const wxBitmap& bitmap, int paletteIndex );
-#endif // wxUSE_PALETTE
- bool Create( const wxBitmap& bitmap );
-
// implementation
GdkBitmap *m_bitmap;
-
GdkBitmap *GetBitmap() const;
-private:
+protected:
+ virtual void FreeData();
+ virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
+ virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
+
DECLARE_DYNAMIC_CLASS(wxMask)
};
{
public:
wxBitmap() { }
- wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH );
+ wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH )
+ { Create(width, height, depth); }
+ wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH )
+ { Create(sz, 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 = wxBITMAP_SCREEN_DEPTH )
{ (void)CreateFromImage(image, depth); }
virtual ~wxBitmap();
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); }
virtual int GetHeight() const;
virtual int GetWidth() const;
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 );
+ const wxPalette *palette = NULL) const;
+ bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
#if wxUSE_PALETTE
wxPalette *GetPalette() const;
void SetHeight( int height );
void SetWidth( int width );
void SetDepth( int depth );
- void SetPixmap( GdkPixmap *pixmap );
- void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0);
+ void SetPixbuf(GdkPixbuf* pixbuf);
GdkPixmap *GetPixmap() const;
bool HasPixmap() const;
bool HasPixbuf() 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;
-
// raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data);
virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
private:
+ void SetPixmap(GdkPixmap* pixmap);
#if wxUSE_IMAGE
// to be called from CreateFromImage only!
bool CreateFromImageAsPixmap(const wxImage& image, int depth);
// (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
void PurgeOtherRepresentations(Representation keep);
-private:
DECLARE_DYNAMIC_CLASS(wxBitmap)
};