X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7fab07efba9b8c9bb21949a82f1a1c2d84d75e3e:/include/wx/gtk1/colour.h?ds=sidebyside diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index 788466d8e9..7bd893b322 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.h +// Name: wx/gtk1/colour.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKCOLOURH__ #define __GTKCOLOURH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,24 +20,30 @@ // classes //----------------------------------------------------------------------------- -class wxDC; -class wxPaintDC; -class wxBitmap; -class wxWindow; +class WXDLLIMPEXP_CORE wxDC; +class WXDLLIMPEXP_CORE wxPaintDC; +class WXDLLIMPEXP_CORE wxBitmap; +class WXDLLIMPEXP_CORE wxWindow; -class wxColour; +class WXDLLIMPEXP_CORE wxColour; //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class wxColour: public wxGDIObject +class WXDLLIMPEXP_CORE wxColour: public wxGDIObject { public: + // constructors + // ------------ + + // default wxColour() { } - // Construct from RGB + // from separate RGB wxColour( unsigned char red, unsigned char green, unsigned char blue ); + + // from packed RGB wxColour( unsigned long colRGB ) { Set(colRGB); } // Implicit conversion from the colour name @@ -52,12 +53,6 @@ public: wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } #endif - - wxColour( const wxColour& col ) - : wxGDIObject() - { Ref(col); } - wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } - ~wxColour(); bool Ok() const { return m_refData != NULL; }