allow to specify the value for unknown ids in GetXRCID() (patch 1448981)

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

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index feae373c8a9469eecc7b9af6926829b3395a25be..504aeabf0c70329d257542060aeffef043ef49f0 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -12,12 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/colour.h"
+
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/colour.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
@@ -50,27 +51,11 @@ wxColour& wxColour::operator =(const wxColour& col)
     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::InitWith(unsigned char r, unsigned char g, unsigned char b)
 {
     m_red = r;
     m_green = g;