X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/deb3ea6a34ff777bfd5e587cca86f35680a28096..8fef2a9b08766582f18a87f675ad574eba58e640:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 56ef566d85..83c00940ff 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/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 #include "wx/object.h" @@ -40,6 +40,10 @@ public: // 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) @@ -54,11 +58,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; }