X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af498247c5ea024a781d0ef8d30cbbfb44749641..afd0f084f419d769dba772863472a3f388fd6ab1:/src/msw/colour.cpp diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index 93f059049b..af6adf93be 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/msw/colour.cpp // Purpose: wxColour class // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "colour.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,6 +18,7 @@ #include "wx/gdicmn.h" #include "wx/msw/private.h" +#include "wx/colour.h" #include @@ -55,7 +52,7 @@ template<> void wxStringWriteValue(wxString &s , const wxColour &data ) wxTO_STRING_IMP( wxColour ) wxFROM_STRING_IMP( wxColour ) - + IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" , &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour )) wxBEGIN_PROPERTIES_TABLE(wxColour) @@ -83,21 +80,6 @@ void wxColour::Init() m_green = 0; } -wxColour::wxColour(const wxColour& col) -{ - *this = col; -} - -wxColour& wxColour::operator=(const wxColour& col) -{ - m_red = col.m_red; - m_green = col.m_green; - m_blue = col.m_blue; - m_isInit = col.m_isInit; - m_pixel = col.m_pixel; - return *this; -} - void wxColour::InitFromName(const wxString& name) { if ( wxTheColourDatabase ) @@ -126,4 +108,3 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b) m_isInit = true; m_pixel = PALETTERGB(m_red, m_green, m_blue); } -