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 60a67d84571fe1e9e371fd2e1533d727eb17bcd3..5ef30bb4d0330e69296085fad842731dbdfa3c3a 100644 (file)
--- 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 <string.h>
 
@@ -53,12 +50,15 @@ template<> void wxStringWriteValue(wxString &s , const wxColour &data )
         data.Red(), data.Green(), data.Blue() );
 }
 
-IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<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)
-    wxREADONLY_PROPERTY( Red, unsigned char, Red,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxREADONLY_PROPERTY( Green, unsigned char, Green,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
-    wxREADONLY_PROPERTY( Blue, unsigned char, Blue,  , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Red, unsigned char, Red, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Green, unsigned char, Green, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
+    wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group"))
 wxEND_PROPERTIES_TABLE()
 
 wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
@@ -81,6 +81,7 @@ void wxColour::Init()
 }
 
 wxColour::wxColour(const wxColour& col)
+         :wxObject()
 {
     *this = col;
 }
@@ -123,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);
 }
-