X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..4410d619c5a29e025b3ee5cd2363d8795aaf841c:/src/msw/colour.cpp?ds=sidebyside

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index bfc43c65a9..10a4ece72d 100644
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "colour.h"
 #endif
 
@@ -21,24 +21,37 @@
 #endif
 
 #include "wx/gdicmn.h"
+#include "wx/msw/private.h"
 
 #include <string.h>
-#include <windows.h>
 
-#if !USE_SHARED_LIBRARY
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) 
+
+WX_BEGIN_PROPERTIES_TABLE(wxColour)
+	WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 )
+	WX_READONLY_PROPERTY( Green, unsigned char  , Green , 0 ) 
+	WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 )
+WX_END_PROPERTIES_TABLE()
+
+WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+
+WX_BEGIN_HANDLERS_TABLE(wxColour)
+WX_END_HANDLERS_TABLE()
+#else
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #endif
 
 // Colour
 
-wxColour::wxColour (void)
+wxColour::wxColour ()
 {
   m_isInit = FALSE;
   m_pixel = 0;
   m_red = m_blue = m_green = 0;
 }
 
-wxColour::wxColour (const unsigned char r, const unsigned char g, const unsigned char b)
+wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
 {
   m_red = r;
   m_green = g;
@@ -66,7 +79,7 @@ wxColour& wxColour::operator =(const wxColour& col)
   return *this;
 }
 
-wxColour::wxColour (const wxString& col)
+void wxColour::InitFromName(const wxString& col)
 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (col);
   if (the_colour)
@@ -86,29 +99,8 @@ wxColour::wxColour (const wxString& col)
   m_pixel = PALETTERGB (m_red, m_green, m_blue);
 }
 
-wxColour::~wxColour (void)
-{
-}
-
-wxColour& wxColour::operator = (const wxString& col)
+wxColour::~wxColour()
 {
-  wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-  if (the_colour)
-    {
-      m_red = the_colour->Red ();
-      m_green = the_colour->Green ();
-      m_blue = the_colour->Blue ();
-      m_isInit = TRUE;
-    }
-  else
-    {
-      m_red = 0;
-      m_green = 0;
-      m_blue = 0;
-      m_isInit = FALSE;
-    }
-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
-  return (*this);
 }
 
 void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)