SetValue() takes just bool, not const bool

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 56ef566d8585c1c629674291e8d9c5681d04469b..83c00940ff937b38a2e572c2a662b7b889358e71 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

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

 #pragma interface "colour.h"
 #endif
 #include "wx/object.h"
 #pragma interface "colour.h"
 #endif
 #include "wx/object.h"


@@ -40,6 +40,10 @@ public:
     // dtor
   ~wxColour();
 
     // dtor
   ~wxColour();
 

+  // to have the matching Create also for this class 
+  void Create( unsigned char red, unsigned char green, unsigned char blue )
+  {    Set( red , green , blue ) ; }
+

   // Set() functions
   void Set( unsigned char red, unsigned char green, unsigned char blue );
   void Set(unsigned long colRGB)
   // Set() functions
   void Set( unsigned char red, unsigned char green, unsigned char blue );
   void Set(unsigned long colRGB)


@@ -54,11 +58,6 @@ public:
   // accessors
   bool Ok() const {return m_isInit; }
 
   // 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; }
   unsigned char Red() const { return m_red; }
   unsigned char Green() const { return m_green; }
   unsigned char Blue() const { return m_blue; }