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

[wxWidgets.git] / src / cocoa / colour.mm

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index 9a8e057b07089d2cd23b0db536307e2cb1dbaa81..94c1f4cc860b375c3e02f87823e08c7d58265916 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -10,12 +10,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif //WX_PRECOMP
+
 #include "wx/cocoa/autorelease.h"
 
 #import <AppKit/NSColor.h>
@@ -55,28 +56,12 @@ 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 ()
 {
     [m_cocoaNSColor release];
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b)
 {
     wxAutoNSAutoreleasePool pool;
     [m_cocoaNSColor release];