X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8169ce715c04fd2670a2e5eaafc3117756580e0..24c7767fc8e093be0f0790c78daeb12b4e58579b:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index 02383e7ff2..25b6d3b726 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: colour.h // Purpose: wxColour class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#ifdef __GNUG__ +#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; }