Win64 compilation fixes

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index 7ea51be97c4de8ecca1e288edfaadba05a638bbb..60a67d84571fe1e9e371fd2e1533d727eb17bcd3 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -6,10 +6,10 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "colour.h"
 #endif
 
 #pragma implementation "colour.h"
 #endif
 


@@ -26,99 +26,101 @@
 #include <string.h>
 
 #if wxUSE_EXTENDED_RTTI
 #include <string.h>
 
 #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()
+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(wxT("#%02X%02X%02X"),
+        data.Red(), data.Green(), data.Blue() );
+}
+
+IMPLEMENT_DYNAMIC_CLASS_WITH_COPY_AND_STREAMERS_XTI( wxColour , wxObject , "wx/colour.h" ,  &wxToStringConverter<wxColour> , &wxFromStringConverter<wxColour>)

 
 

-WX_CONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+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"))
+wxEND_PROPERTIES_TABLE()

 
 

-WX_BEGIN_HANDLERS_TABLE(wxColour)
-WX_END_HANDLERS_TABLE()
+wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )
+
+wxBEGIN_HANDLERS_TABLE(wxColour)
+wxEND_HANDLERS_TABLE()

 #else
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #endif
 
 // Colour
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #endif
 
 // Colour
 

-wxColour::wxColour ()
-{
-  m_isInit = FALSE;
-  m_pixel = 0;
-  m_red = m_blue = m_green = 0;
-}
-
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Init()

 {
 {

-  m_red = r;
-  m_green = g;
-  m_blue = b;
-  m_isInit = TRUE;
-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
+    m_isInit = false;
+    m_pixel = 0;
+    m_red =
+    m_blue =
+    m_green = 0;

 }
 
 }
 

-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(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;
+    *this = col;

 }
 
 }
 

-wxColour& wxColour::operator =(const wxColour& 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;
+    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& col)
+void wxColour::InitFromName(const wxString& name)

 {
 {

-  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
+    if ( wxTheColourDatabase )

     {
     {

-      m_red = 0;
-      m_green = 0;
-      m_blue = 0;
-      m_isInit = FALSE;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
     }

-  m_pixel = PALETTERGB (m_red, m_green, m_blue);
-}

 
 

-wxColour::~wxColour()
-{
+    // leave invalid
+    Init();

 }
 
 }
 

-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+wxColour::~wxColour()

 {
 {

-  m_red = r;
-  m_green = g;
-  m_blue = 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
+void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)

 {
 {

-  *r = m_red;
-  *g = m_green;
-  *b = m_blue;
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_isInit = true;
+    m_pixel = PALETTERGB(m_red, m_green, m_blue);

 }
 }

-#endif