Changed all symbols with the name "id" to "timerid" to allow Objective-C++

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

diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h
index 2d0ab28c1539ab857912b24d5371488f1d9a3479..1d60215d654d3d1f0fe78955cc4a43300b5ac909 100644 (file)
--- a/include/wx/motif/colour.h
+++ b/include/wx/motif/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "colour.h"
 #endif
 
@@ -28,7 +28,8 @@ public:
     // default
     wxColour();
     // from RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue );
+    wxColour( unsigned char red, unsigned char green, unsigned char blue )
+        { Set(red, green, blue); }
     wxColour( unsigned long colRGB ) { Set(colRGB); }
     
     // implicit conversion from the colour name
@@ -65,7 +66,10 @@ public:
     inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
     
     inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
-    
+
+    // Get colour from name or wxNullColour
+    static wxColour CreateByName(const wxString& name);
+
     // Allocate a colour, or nearest colour, using the given display.
     // If realloc is TRUE, ignore the existing pixel, otherwise just return
     // the existing one.