update from James Bishop

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

diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h
index 884b849c57c8540209e173a8b73499270ed4a96d..357d8657d31aedb9011cb3be3715f07d392e6fed 100644 (file)
--- a/include/wx/x11/colour.h
+++ b/include/wx/x11/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "colour.h"
 #endif
 
@@ -37,18 +37,24 @@ class wxColour;
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColour: public wxGDIObject
+class WXDLLEXPORT wxColour: public wxGDIObject
 {
 public:
     wxColour() { }
-  
+
     // Construct from RGB
     wxColour( unsigned char red, unsigned char green, unsigned char blue );
     wxColour( unsigned long colRGB ) { Set(colRGB); }
 
     // Implicit conversion from the colour name
     wxColour( const wxString &colourName ) { InitFromName(colourName); }
-    wxColour( const char *colourName ) { InitFromName(colourName); }
+    wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); }
+#if wxUSE_UNICODE
+    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
+
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
 
     wxColour( const wxColour& col ) { Ref(col); }
     wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
@@ -56,7 +62,7 @@ public:
     ~wxColour();
 
     bool Ok() const { return m_refData != NULL; }
-  
+
     bool operator == ( const wxColour& col ) const;
     bool operator != ( const wxColour& col ) const { return !(*this == col); }
 
@@ -75,18 +81,18 @@ public:
     unsigned char Blue() const;
 
     // Implementation part
-    
+
     void CalcPixel( WXColormap cmap );
     unsigned long GetPixel() const;
     WXColor *GetColor() const;
 
+    void InitFromName(const wxString& colourName);
+
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
-    // Helper functions
-    void InitFromName(const wxString& colourName);
+
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
@@ -94,4 +100,5 @@ private:
 
 #endif
 
-// _WX_COLOUR_H_
\ No newline at end of file
+// _WX_COLOUR_H_
+