Don't use Windows handles directly in headers

[wxWidgets.git] / src / msw / colour.cpp

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index f59c3fd2b22ac44f9bd5feb2e8cd73a74a7a89ff..5ef30bb4d0330e69296085fad842731dbdfa3c3a 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/msw/colour.cpp

 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// 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"
 
 // 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/gdicmn.h"
 #include "wx/msw/private.h"

+#include "wx/colour.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -55,7 +52,7 @@ template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 
 wxTO_STRING_IMP( wxColour )
 wxFROM_STRING_IMP( wxColour )
 
 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)
 IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxTO_STRING( wxColour ) , &wxFROM_STRING( wxColour ))
 
 wxBEGIN_PROPERTIES_TABLE(wxColour)


@@ -84,6 +81,7 @@ void wxColour::Init()
 }
 
 wxColour::wxColour(const wxColour& col)
 }
 
 wxColour::wxColour(const wxColour& col)

+         :wxObject()

 {
     *this = col;
 }
 {
     *this = col;
 }


@@ -126,4 +124,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);
 }
     m_isInit = true;
     m_pixel = PALETTERGB(m_red, m_green, m_blue);
 }

-