fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / gdiobj.h

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 77b4c532f26579b28d1e141a9848388385b21dee..d38a44bb7e5065fee1d74ad9a3199e713c9243da 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -20,12 +20,19 @@
 // the same native GDI object
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_FWD_CORE wxGDIRefData : public wxObjectRefData
+class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData
 {
 public:
+    // Default ctor which needs to be defined just because we use
+    // wxDECLARE_NO_COPY_CLASS() below.
+    wxGDIRefData() { }
+
     // override this in the derived classes to check if this data object is
     // really fully initialized
     virtual bool IsOk() const { return true; }
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxGDIRefData);
 };
 
 // ----------------------------------------------------------------------------
@@ -40,7 +47,7 @@ public:
     {
         // the cast here is safe because the derived classes always create
         // wxGDIRefData objects
-        return m_refData && wx_static_cast(wxGDIRefData *, m_refData)->IsOk();
+        return m_refData && static_cast<wxGDIRefData *>(m_refData)->IsOk();
     }
 
     // don't use in the new code, use IsOk() instead
@@ -74,7 +81,7 @@ protected:
 
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
     {
-        return CloneGDIRefData(wx_static_cast(const wxGDIRefData *, data));
+        return CloneGDIRefData(static_cast<const wxGDIRefData *>(data));
     }
 
     virtual wxGDIRefData *CreateGDIRefData() const = 0;