Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 77b4c532f26579b28d1e141a9848388385b21dee..903dfe083d0d6999b88bcd223f53cb8b54c3e783 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -5,7 +5,6 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart

-// RCS-ID:      $Id$

 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -20,12 +19,19 @@
 // the same native GDI object
 // ----------------------------------------------------------------------------
 
 // the same native GDI object
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_FWD_CORE wxGDIRefData : public wxObjectRefData
+class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData

 {
 public:
 {
 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; }
     // 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 +46,7 @@ public:
     {
         // the cast here is safe because the derived classes always create
         // wxGDIRefData objects
     {
         // 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
     }
 
     // don't use in the new code, use IsOk() instead


@@ -50,7 +56,7 @@ public:
     // because it's still widely used)
     bool Ok() const { return IsOk(); }
 
     // because it's still widely used)
     bool Ok() const { return IsOk(); }
 

-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXPALMOS__)
+#if defined(__WXMSW__) || defined(__WXPM__)

     // Creates the resource
     virtual bool RealizeResource() { return false; }
 
     // Creates the resource
     virtual bool RealizeResource() { return false; }
 


@@ -74,7 +80,7 @@ protected:
 
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
     {
 
     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;
     }
 
     virtual wxGDIRefData *CreateGDIRefData() const = 0;