X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23bed520417f9946f01bbcf2f18c26a7bc3cb2a7..cb7acf9cc78c309026bed1038631f2663cd90bda:/wxPython/src/gdi.i

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 697de042fa..a8d6dd79bc 100644
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -643,6 +643,25 @@ public:
 
     %addmethods {
         void Append(const wxString& name, int red, int green, int blue) {
+            // first see if the name is already there
+            wxString cName = name;
+            cName.MakeUpper();
+            wxString cName2 = cName;
+            if ( !cName2.Replace("GRAY", "GREY") )
+                cName2.clear();
+
+            wxNode *node = self->First();
+            while ( node ) {
+                const wxChar *key = node->GetKeyString();
+                if ( cName == key || cName2 == key ) {
+                    wxColour* c = (wxColour *)node->Data();
+                    c->Set(red, green, blue);
+                    return;
+                }
+                node = node->Next();
+            }
+
+            // otherwise append the new colour
             self->Append(name.c_str(), new wxColour(red, green, blue));
         }
     }
@@ -1148,7 +1167,7 @@ public:
 //---------------------------------------------------------------------------
 
 
-#ifdef __WXMSW__
+#ifndef __WXGTK__
 
 %{
 #include <wx/metafile.h>