use GlobalPtrLock (modified to allow not initializing it if the ptr is NULL) in wxGet...

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 522d7345c0807f472e87bf8b5ff44e5b940eaba0..e7d12c14b28a134648200ed457a66512b3c4b477 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -22,9 +22,6 @@ class WXDLLEXPORT wxColour : public wxColourBase
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour() { Init(); }
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
@@ -36,7 +33,7 @@ public:
 
 
     // accessors
-    bool Ok() 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; }
     unsigned char Blue() const { return m_blue; }