don't lock the gs_prevCS critical section recursively (replaces patch 1857581)

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 28627daa0a0c372aea30da30f8a5a394c6a3fadb..24fefe2f6be054f26b8467e01c9afa0bdf6d9d07 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -20,9 +20,6 @@ class WXDLLEXPORT wxColour: public wxColourBase
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour();
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
@@ -33,8 +30,7 @@ public:
     virtual ~wxColour();
 
     // accessors
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_isInit; }
+    virtual bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }