// Initialize with raw XBM data
wxBitmap(const char bits[], int width, int height, int depth = 1);
- // Initialize with XPM data
- wxBitmap(char **data, wxControl* control = NULL);
+ // from XPM
+ wxBitmap(const char **data) { (void)CreateFromXpm(data); }
+ wxBitmap(char **data) { (void)CreateFromXpm((const char **)data); }
+
+ // Initialize with XPM data -- deprecated
+ wxBitmap(char **data, wxControl* control);
// Load a file or resource
wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);
virtual bool Create(int width, int height, int depth = -1);
virtual bool Create(void *data, long type, int width, int height, int depth = 1);
+
+ wxBitmap GetSubBitmap( const wxRect& rect ) const;
+
virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);
virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
// Motif implementation
public:
WXDisplay* GetDisplay() const { return M_BITMAPDATA->m_display; }
- WXDisplay* GetPixmap() const { return M_BITMAPDATA->m_pixmap; }
+ WXPixmap GetPixmap() const { return (WXPixmap) M_BITMAPDATA->m_pixmap; }
virtual WXPixmap GetLabelPixmap(WXWidget w) ;
virtual WXPixmap GetArmPixmap(WXWidget w) ;
virtual WXPixmap GetInsensPixmap(WXWidget w = (WXWidget) 0) ;
+ void SetPixmapNull() { M_BITMAPDATA->m_pixmap = 0; }
protected:
static wxList sm_handlers;
+
+protected:
+ bool CreateFromXpm(const char **bits);
};
// Creates a bitmap with transparent areas drawn in
// the given colour.
-wxBitmap wxCreateMaskedBitmap(wxBitmap& bitmap, wxColour& colour);
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);
#endif
// _WX_BITMAP_H_