added NO_PTR versions of ARRAY macros to suppress warnings (based on patch 770983)

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index bce0560ddb8a69f9adeded965f92655f32a375cf..de243d30a7df5ca2c9a27995c76314b8d3a7a2b8 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -11,7 +11,7 @@
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 
 #ifndef __GTKCOLOURH__
 #define __GTKCOLOURH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -47,9 +47,15 @@ public:
 
     // Implicit conversion from the colour name
     wxColour( const wxString &colourName ) { InitFromName(colourName); }
 
     // 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
+

 
 

-    wxColour( const wxColour& col ) { Ref(col); }
+    wxColour( const wxColour& col )
+        : wxGDIObject()
+        { Ref(col); }

     wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
 
     ~wxColour();
     wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
 
     ~wxColour();