merged optimizations from 2.2

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

diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp
index bfc43c65a9eefac2bae33689a7d882c9e0d2c961..a7df1a6f25b4835e99858d1981dccfa1b1ba4266 100644 (file)
--- a/src/msw/colour.cpp
+++ b/src/msw/colour.cpp
@@ -25,20 +25,18 @@
 #include <string.h>
 #include <windows.h>
 
 #include <string.h>
 #include <windows.h>
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

-#endif

 
 // Colour
 
 
 // Colour
 

-wxColour::wxColour (void)
+wxColour::wxColour ()

 {
   m_isInit = FALSE;
   m_pixel = 0;
   m_red = m_blue = m_green = 0;
 }
 
 {
   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;
 {
   m_red = r;
   m_green = g;


@@ -66,7 +64,7 @@ wxColour& wxColour::operator =(const wxColour& col)
   return *this;
 }
 
   return *this;
 }
 

-wxColour::wxColour (const wxString& col)
+void wxColour::InitFromName(const wxString& col)

 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (col);
   if (the_colour)
 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (col);
   if (the_colour)


@@ -86,31 +84,10 @@ wxColour::wxColour (const wxString& col)
   m_pixel = PALETTERGB (m_red, m_green, m_blue);
 }
 
   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;
 void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 {
   m_red = r;