check that the version of __sync_sub_and_fetch that returns a value is supported...

[wxWidgets.git] / include / wx / gtk1 / colour.h

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index c5006cf4fb73ba6963b8ffaf59419ddbde85bd35..ae9e22fdcd2844b2ec981deb1fefe0bf2eb5a7a0 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -20,12 +20,12 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxDC;
-class WXDLLIMPEXP_CORE wxPaintDC;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
 
-class WXDLLIMPEXP_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -43,9 +43,8 @@ public:
 
     virtual ~wxColour();
 
-    virtual bool FromString(const wxChar *str);
+    virtual bool FromString(const wxString& str);
 
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;