no changes, just remove #if'd out code

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 3f628a90d69a011e5f3d1a53cfc7f53c58ec3411..01a825a2c6031b49e9e2bd15fb026545d13a3351 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -16,15 +16,12 @@
 #include "wx/string.h"
 
 // Colour
 #include "wx/string.h"
 
 // Colour

-class WXDLLEXPORT wxColour : public wxColourBase
+class WXDLLIMPEXP_CORE wxColour : public wxColourBase

 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:
     // constructors
     // ------------
 {
     DECLARE_DYNAMIC_CLASS(wxColour)
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { Init(); }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators


@@ -36,8 +33,7 @@ public:
 
 
     // accessors
 
 
     // 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; }
     unsigned char Blue() const { return m_blue; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }