Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 6c404b6a8e22a224bd44a9441a0e675715c49aa7..29572c48707d0a6deea5b71b8f6c86bce7b47878 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -84,9 +84,6 @@ public:
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 

-    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);


@@ -138,8 +135,8 @@ public:
     WXDisplay *GetDisplay() const;
 
 protected:
     WXDisplay *GetDisplay() const;
 
 protected:

-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)