removed wxUSE_TOOLBAR_SIMPLE leftovers from the main sources, it's not used anywhere...

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 8f1b3a631f58a31cd3723cf7fc4f00d71626dc31..502886f31fe19cc89417f5262b4910ebb43b405c 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -44,8 +44,6 @@ public:
 
     ~wxColour();
 
-    virtual bool FromString(const wxChar *str);
-
     bool Ok() const { return m_refData != NULL; }
 
     bool operator == ( const wxColour& col ) const;
@@ -66,6 +64,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
+    virtual bool FromString(const wxChar *str);
     virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
 
 private: