added wxRTTI macros to stream classes (patch 1687073)

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 9cf858f8935892dbeacda2e83e8036761e7ad602..84e7f3ebc08d856fa633eb3468efa55a5d0b741b 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -74,7 +74,7 @@ public:
     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)
     {
@@ -84,8 +84,6 @@ public:
     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 { return IsOk(); }
     bool IsOk() const;
 
@@ -139,9 +137,12 @@ public:
 
     WXDisplay *GetDisplay() const;
 
+protected:
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
-#endif
-// _WX_BITMAP_H_
+#endif // _WX_BITMAP_H_