From: Robin Dunn <robin@alldunn.com>
Date: Wed, 22 Oct 2003 17:21:47 +0000 (+0000)
Subject: Updates for wxColourDatabase
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b434e3f0989ebe34e6c09452272897863dee3b23

Updates for wxColourDatabase


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i
index 751642779f..2ad7f44c67 100644
--- a/wxPython/src/gdi.i
+++ b/wxPython/src/gdi.i
@@ -487,20 +487,19 @@ public:
 class wxColourDatabase : public wxObject {
 public:
 
-    wxColour *FindColour(const wxString& colour) ;
-    wxColour *FindColourNoAdd(const wxString& colour) const;
+    wxColourDatabase();
+    ~wxColourDatabase();
+
+    // find colour by name or name for the given colour
+    wxColour Find(const wxString& name) const;
     wxString FindName(const wxColour& colour) const;
 
-    %addmethods {
-        void AddColour(const wxString& name, wxColour* colour) {
-            // make a copy since the python one will be GC'd
-            wxColour* c = new wxColour(*colour);
-            self->AddColour(name, c);
-        }
+    // add a new colour to the database
+    void AddColour(const wxString& name, const wxColour& colour);
 
+    %addmethods {
         void Append(const wxString& name, int red, int green, int blue) {
-            wxColour* c = new wxColour(red, green, blue);
-            self->AddColour(name, c);
+            self->AddColour(name, wxColour(red, green, blue));
         }
     }
 };