changing colour derivation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/colour.h b/include/wx/colour.h
index ee2c023f9086b9bef40e911c1b7b286e762663ff..7da992040246b6cdd9795d972f5e466180738c05 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -55,7 +55,18 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxColour,WXDLLEXPORT)
 //               code redundancy in all native wxColour implementations
 //-----------------------------------------------------------------------------
 
 //               code redundancy in all native wxColour implementations
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxColourBase : public wxGDIObject
+#ifdef __WXMAC__
+#define wxCOLOUR_IS_GDIOBJECT 0
+#else
+#define wxCOLOUR_IS_GDIOBJECT 1
+#endif
+
+class WXDLLEXPORT wxColourBase : public 
+#if wxCOLOUR_IS_GDIOBJECT
+    wxGDIObject
+#else
+    wxObject
+#endif

 {
 public:
     // type of a single colour component
 {
 public:
     // type of a single colour component


@@ -101,7 +112,13 @@ public:
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
 
     // implemented in colourcmn.cpp
     virtual wxString GetAsString(long flags = wxC2S_NAME | wxC2S_CSS_SYNTAX) const;
 

-
+#if !wxCOLOUR_IS_GDIOBJECT
+    virtual bool IsOk() const= 0;
+    
+    // older version, for backwards compatibility only (but not deprecated
+    // because it's still widely used)
+    bool Ok() const { return IsOk(); }
+#endif

 
     // old, deprecated
     // ---------------
 
     // old, deprecated
     // ---------------


@@ -117,6 +134,7 @@ protected:
 
     virtual bool FromString(const wxString& s);
 
 
     virtual bool FromString(const wxString& s);
 

+#if wxCOLOUR_IS_GDIOBJECT

     // wxColour doesn't use reference counted data (at least not in all ports)
     // so provide stubs for the functions which need to be defined if we do use
     // them
     // wxColour doesn't use reference counted data (at least not in all ports)
     // so provide stubs for the functions which need to be defined if we do use
     // them


@@ -133,6 +151,7 @@ protected:
 
         return NULL;
     }
 
         return NULL;
     }

+#endif

 };
 
 
 };