don't create non-existing groups in HasEntry()

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 864bd6f74983cb75fd30aa7d852b95ebbd7f1303..9d656b02614cea2b4d92bca6d84baac109af3403 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/gdicmn.h"

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

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

 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)


@@ -37,27 +40,11 @@ void wxColour::Init()
     wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );
 }
 
     wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );
 }
 

-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;


@@ -67,7 +54,7 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 

-void wxColour::Set( const WXCOLORREF* color )
+void wxColour::FromRGBColor( const WXCOLORREF* color )

 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );
 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );