Bump subrelease number

[wxWidgets.git] / include / wx / x11 / bitmap.h

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index f846fe278431599c2ead2c689ced2ab450df0c3b..84e7f3ebc08d856fa633eb3468efa55a5d0b741b 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -62,12 +62,9 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase
+class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase

 {
 {

-public:
-    wxBitmapHandler() : wxBitmapHandlerBase() {}
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)

 };
 
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 };
 
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase


@@ -76,19 +73,24 @@ public:
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     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 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_TYPE_XPM );
     virtual ~wxBitmap();
 
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 

-    bool operator == ( const wxBitmap& bmp ) const;
-    bool operator != ( const wxBitmap& bmp ) const;
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     static void InitStandardHandlers();
 
     bool Create(int width, int height, int depth = -1);
 
     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);
                 int width, int height, int depth = -1);
     // create the wxBitmap using a _copy_ of the pixmap
     bool Create(WXPixmap pixmap);


@@ -136,11 +138,11 @@ public:
     WXDisplay *GetDisplay() const;
 
 protected:
     WXDisplay *GetDisplay() const;
 
 protected:

-    bool CreateFromXpm(const char **bits);
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

-#endif
-// _WX_BITMAP_H_
+#endif // _WX_BITMAP_H_