X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a8372ba0f655f8f9fec7d942f9665fcb458903c..8ccff7d2116057a0e79db28491a6c7fdf4051a58:/wxPython/src/gtk/gdi.py diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 019cf90676..50ae140e9c 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -325,13 +325,15 @@ class wxColourDatabasePtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def FindColour(self, *_args, **_kwargs): - val = gdic.wxColourDatabase_FindColour(self, *_args, **_kwargs) - if val: val = wxColourPtr(val) - return val - def FindColourNoAdd(self, *_args, **_kwargs): - val = gdic.wxColourDatabase_FindColourNoAdd(self, *_args, **_kwargs) - if val: val = wxColourPtr(val) + def __del__(self, delfunc=gdic.delete_wxColourDatabase): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def Find(self, *_args, **_kwargs): + val = gdic.wxColourDatabase_Find(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 return val def FindName(self, *_args, **_kwargs): val = gdic.wxColourDatabase_FindName(self, *_args, **_kwargs) @@ -345,8 +347,9 @@ class wxColourDatabasePtr(wxObjectPtr): def __repr__(self): return "<%s.%s instance; proxy of C++ wxColourDatabase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) class wxColourDatabase(wxColourDatabasePtr): - def __init__(self,this): - self.this = this + def __init__(self,*_args,**_kwargs): + self.this = gdic.new_wxColourDatabase(*_args,**_kwargs) + self.thisown = 1