Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index c0d26dad039ba7e93a69f65c637b66a6e36158bd..5db020cacd5439dccd15c84846c87a8254259f0e 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,22 +14,20 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour();
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
-    wxColour(const wxColour& col);
-    wxColour& operator=(const wxColour& col);
+    wxColour(const wxColour& col)
+    {
+        *this = col;
+    }
 
-    // dtor
-    virtual ~wxColour();
+    wxColour& operator=(const wxColour& col);
 
     // accessors
     virtual bool IsOk() const { return m_isInit; }