added CanConvert()

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

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index 54fee22346933e8d3818a3d28cf14a31d6dbceb1..9eaf41f563aec351f27913d6dc2cc4a597978906 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "colour.h"
 #endif
 
@@ -21,6 +21,7 @@
 #endif
 
 #include "wx/gdicmn.h"
+#include "wx/colour.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
@@ -87,14 +88,3 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
   m_blue = b;
   m_isInit = TRUE;
 }
-
-// Obsolete
-#if WXWIN_COMPATIBILITY
-void wxColour::Get(unsigned char *r, unsigned char *g, unsigned char *b) const
-{
-  *r = m_red;
-  *g = m_green;
-  *b = m_blue;
-}
-#endif
-