set eol-style

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 8ad40183ff89c38983bb6ace32dbaaa3daa21bfb..6c404b6a8e22a224bd44a9441a0e675715c49aa7 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -22,9 +22,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxMask;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -74,11 +74,16 @@ 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 );
+#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();
 
-    bool operator == ( const wxBitmap& bmp ) const;
-    bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
 
@@ -132,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_