Stop crash when wxVSCROLL is specified for native OS X wxListCtrl.

[wxWidgets.git] / src / mac / classic / colour.cpp

diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp
index b3f4209f3fb43dc0eab248aca7e1d292ef0e2de4..17760ac498e74b5ae3a9b080a960957261167bca 100644 (file)
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/colour.cpp
@@ -1,17 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/mac/classic/colour.cpp
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/gdicmn.h"
+#include "wx/wxprec.h"
+
 #include "wx/colour.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
@@ -70,27 +75,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;