#if around deprecated macros

[wxWidgets.git] / wxPython / src / gtk / gdi.py

diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index 2724b09ce0ad784e993f1c2c0073b02dcf1cf20d..50ae140e9cb09efde343666f1db02788b9fbda90 100644 (file)
--- a/wxPython/src/gtk/gdi.py
+++ b/wxPython/src/gtk/gdi.py
@@ -170,6 +170,41 @@ class wxIcon(wxIconPtr):
 
 
 
+class wxIconLocationPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self, delfunc=gdic.delete_wxIconLocation):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def IsOk(self, *_args, **_kwargs):
+        val = gdic.wxIconLocation_IsOk(self, *_args, **_kwargs)
+        return val
+    def SetFileName(self, *_args, **_kwargs):
+        val = gdic.wxIconLocation_SetFileName(self, *_args, **_kwargs)
+        return val
+    def GetFileName(self, *_args, **_kwargs):
+        val = gdic.wxIconLocation_GetFileName(self, *_args, **_kwargs)
+        return val
+    def SetIndex(self, *_args, **_kwargs):
+        val = gdic.wxIconLocation_SetIndex(self, *_args, **_kwargs)
+        return val
+    def GetIndex(self, *_args, **_kwargs):
+        val = gdic.wxIconLocation_GetIndex(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxIconLocation(wxIconLocationPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = gdic.new_wxIconLocation(*_args,**_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxIconBundlePtr :
     def __init__(self,this):
         self.this = this
@@ -272,7 +307,7 @@ class wxColourPtr(wxObjectPtr):
         return "<%s.%s instance; proxy of C++ wxColour instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
     asTuple = Get
     def __str__(self):                  return str(self.asTuple())
-    def __repr__(self):                 return 'wxColour:' + str(self.asTuple())
+    def __repr__(self):                 return 'wxColour' + str(self.asTuple())
     def __nonzero__(self):              return self.Ok()
     def __getinitargs__(self):          return ()
     def __getstate__(self):             return self.asTuple()
@@ -290,21 +325,31 @@ 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) 
+    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)
         return val
+    def AddColour(self, *_args, **_kwargs):
+        val = gdic.wxColourDatabase_AddColour(self, *_args, **_kwargs)
+        return val
     def Append(self, *_args, **_kwargs):
         val = gdic.wxColourDatabase_Append(self, *_args, **_kwargs)
         return val
     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
 
 
 
@@ -1027,6 +1072,20 @@ class wxWindowDC(wxWindowDCPtr):
 
 
 
+class wxMirrorDCPtr(wxDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxMirrorDC(wxMirrorDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = gdic.new_wxMirrorDC(*_args,**_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxPalettePtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -1243,6 +1302,9 @@ class wxRegionIteratorPtr(wxObjectPtr):
     def Next(self, *_args, **_kwargs):
         val = gdic.wxRegionIterator_Next(self, *_args, **_kwargs)
         return val
+    def __nonzero__(self, *_args, **_kwargs):
+        val = gdic.wxRegionIterator___nonzero__(self, *_args, **_kwargs)
+        return val
     def __repr__(self):
         return "<%s.%s instance; proxy of C++ wxRegionIterator instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
 class wxRegionIterator(wxRegionIteratorPtr):
@@ -1297,6 +1359,11 @@ def wxIconFromBitmap(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
+def wxIconFromLocation(*_args, **_kwargs):
+    val = gdic.wxIconFromLocation(*_args,**_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+
 def wxStockCursor(*_args, **_kwargs):
     val = gdic.wxStockCursor(*_args,**_kwargs)
     if val: val = wxCursorPtr(val); val.thisown = 1