compilation fix for non-threaded compilation (threads are still broken

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

diff --git a/src/stubs/colour.cpp b/src/stubs/colour.cpp
index d342d516de631ee3b2844d89fadbfbfc1bae0b42..f2c7fe382cbe5ba77894a58735e670882e8cf34c 100644 (file)
--- a/src/stubs/colour.cpp
+++ b/src/stubs/colour.cpp
@@ -16,9 +16,7 @@
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
 
 // Colour
 
@@ -65,7 +63,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)
@@ -91,29 +89,6 @@ 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;
-    }
-/* TODO
-    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;