applied Otto Wyss' patch to extend wxHelpController::KeywordSearch with mode argument...

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index d538f5f6a473c8b2b8b14c1e7eda71a622a403b3..25b6d3b7268db915bea0d73262496dfd19b87603 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/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
 
@@ -36,7 +36,7 @@ public:
   wxColour( const wxString &colourName )
       : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
       { InitFromName(colourName); }
-  wxColour( const char *colourName )
+  wxColour( const wxChar *colourName )
       : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
       { InitFromName(colourName); }
 
@@ -62,11 +62,6 @@ public:
   // accessors
   bool Ok() const {return m_isInit; }
 
-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-
   unsigned char Red() const { return m_red; }
   unsigned char Green() const { return m_green; }
   unsigned char Blue() const { return m_blue; }