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 1a065ff8b6911b4c23e4fada6083b840a80327c1..17760ac498e74b5ae3a9b080a960957261167bca 100644 (file)
--- a/src/mac/classic/colour.cpp
+++ b/src/mac/classic/colour.cpp
@@ -1,25 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
+#include "wx/wxprec.h"

 
 

-#include "wx/gdicmn.h"

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

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

+IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+

 // Colour
 
 #include "wx/mac/private.h"
 // Colour
 
 #include "wx/mac/private.h"


@@ -76,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;