Eliminated bizarre VC++ internal compiler errors, perhaps related to

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index bfc43c65a9eefac2bae33689a7d882c9e0d2c961..1f99c2a34832a2313f6a5cc6aea128434fb66e23 100644 (file)
--- 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,69 @@
 #endif
 
 #include "wx/gdicmn.h"
+#include "wx/msw/private.h"
 
 #include <string.h>
-#include <windows.h>
 
-#if !USE_SHARED_LIBRARY
+#if wxUSE_EXTENDED_RTTI
+
+/*
+
+template<> void wxStringReadValue(const wxString &s , wxColour &data )
+{
+       // copied from VS xrc
+       unsigned long tmp = 0;
+
+    if (s.Length() != 7 || s[0u] != wxT('#') ||
+        wxSscanf(s.c_str(), wxT("#%lX"), &tmp) != 1)
+    {
+               wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+                   s.c_str() );
+        data = wxNullColour;
+    }
+       else
+       {
+               data = wxColour((unsigned char) ((tmp & 0xFF0000) >> 16) ,
+                    (unsigned char) ((tmp & 0x00FF00) >> 8),
+                    (unsigned char) ((tmp & 0x0000FF)));
+       }
+}
+
+template<> void wxStringWriteValue(wxString &s , const wxColour &data )
+{
+       s = wxString::Format("#%2X%2X%2X", data.Red() , data.Green() , data.Blue() ) ;
+}
+
+WX_CUSTOM_TYPE_INFO(wxColour)
+
+*/
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_XTI( wxColour , wxObject , "wx/colour.h" ) 
+
+WX_BEGIN_PROPERTIES_TABLE(wxColour)
+       WX_READONLY_PROPERTY( Red, unsigned char , Red , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+       WX_READONLY_PROPERTY( Green, unsigned char  , Green , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 
+       WX_READONLY_PROPERTY( Blue, unsigned char , Blue , 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+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 +111,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,31 +131,10 @@ wxColour::wxColour (const wxString& col)
   m_pixel = PALETTERGB (m_red, m_green, m_blue);
 }
 
-wxColour::~wxColour (void)
+wxColour::~wxColour()
 {
 }
 
-wxColour& wxColour::operator = (const wxString& col)
-{
-  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)
 {
   m_red = r;
@@ -119,14 +143,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);
 }
-
-// Obsolete
-#if WXWIN_COMPATIBILITY
-void wxColour::Get (unsigned char *r, unsigned char *g, unsigned char *b) const
-{
-  *r = m_red;
-  *g = m_green;
-  *b = m_blue;
-}
-#endif
-