added wxXmlResource::FindXRCIDById() (#10026)

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index cfb75a682607f5da8727cde61b4f764616255168..9a9a13f98cb15c5aa380039ec223acd0f9edd505 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -1,26 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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:    wxWindows 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop
+#endif
+
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"

 #include "wx/msw/private.h"
 
 #include <string.h>
 #include "wx/msw/private.h"
 
 #include <string.h>


@@ -29,38 +30,31 @@
 
 template<> void wxStringReadValue(const wxString &s , wxColour &data )
 {
 
 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)
+    if ( !data.Set(s) )

     {
     {

-               wxLogError(_("String To Colour : Incorrect colour specification : %s"),
-                   s.c_str() );
+        wxLogError(_("String To Colour : Incorrect colour specification : %s"),
+            s.c_str() );

         data = wxNullColour;
     }
         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 )
 {
 }
 
 template<> void wxStringWriteValue(wxString &s , const wxColour &data )
 {

-       s = wxString::Format(wxT("#%02X%02X%02X"), data.Red() , data.Green() , data.Blue() ) ;
+    s = data.GetAsString(wxC2S_HTML_SYNTAX);

 }
 
 }
 

-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)
 
 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()
 
 wxEND_PROPERTIES_TABLE()
 

-wxCONSTRUCTOR_3( wxColour , unsigned char , Red , unsigned char , Green , unsigned char , Blue )  
+wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue )

 
 wxBEGIN_HANDLERS_TABLE(wxColour)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxColour)
 wxEND_HANDLERS_TABLE()


@@ -72,54 +66,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 void wxColour::Init()
 {
 
 void wxColour::Init()
 {

-    m_isInit = FALSE;
+    m_isInit = false;

     m_pixel = 0;
     m_pixel = 0;

+    m_alpha =

     m_red =
     m_blue =
     m_green = 0;
 }
 
     m_red =
     m_blue =
     m_green = 0;
 }
 

-wxColour::wxColour (const wxColour& col)
-{
-    *this = 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;
-}
-
-void wxColour::InitFromName(const wxString& name)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
-}
-
-wxColour::~wxColour()
-{
-}
-
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
+                        unsigned char a)

 {
     m_red = r;
     m_green = g;
     m_blue = b;
 {
     m_red = r;
     m_green = g;
     m_blue = b;

-    m_isInit = TRUE;
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
+    m_alpha = a;
+    m_isInit = true;
+    m_pixel = PALETTERGB(m_red, m_green, m_blue);

 }
 }

-