[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/mgl/colour.cpp b/src/mgl/colour.cpp
index ebab19fba22f0f7c7dfeab0d7d38f9451d30a2b8..f4f27268794f0c2be1fb42f09acfa80269d90390 100644 (file)
--- a/src/mgl/colour.cpp
+++ b/src/mgl/colour.cpp
@@ -1,28 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.cpp
+// Name:        src/mgl/colour.cpp
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
@@ -32,7 +31,12 @@ void wxColour::Init()
     m_red =
     m_blue =
     m_green = 0;
-    m_isInit = FALSE;
+    m_isInit = false;
+}
+
+wxColour::wxColour()
+{
+    Init();
 }
 
 wxColour::wxColour(const wxColour& col)
@@ -49,27 +53,14 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
-void wxColour::InitFromName(const wxString& name)
-{
-    wxColour *col = wxTheColourDatabase->Find(name);
-    if ( col.Ok() )
-    {
-        *this = col;
-    }
-    else
-    {
-        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;
     m_blue = b;
-    m_isInit = TRUE;
+    m_isInit = true;
 }