Include wx/image.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/mac/classic/colour.cpp b/src/mac/classic/colour.cpp
index 1b1e1052db2e67c3f35944a0aaeee7080ae366fa..17760ac498e74b5ae3a9b080a960957261167bca 100644 (file)
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/colour.cpp
@@ -9,9 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/gdicmn.h"
+#include "wx/wxprec.h"
+

 #include "wx/colour.h"
 
 #include "wx/colour.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour


@@ -70,27 +75,11 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
     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 ()
 {
 }
 
 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;
 {
     m_red = r;
     m_green = g;