SWIGged updates for wxGTK

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

diff --git a/wxPython/src/gtk/cmndlgs.py b/wxPython/src/gtk/cmndlgs.py
index b5ef576255a162096d85ed8f301da6feee011512..9555d3bc8261e698459c27a6a8187f4a0948a2c1 100644 (file)
--- a/wxPython/src/gtk/cmndlgs.py
+++ b/wxPython/src/gtk/cmndlgs.py
@@ -5,6 +5,8 @@ from misc import *
 
 from gdi import *
 
+from fonts import *
+
 from windows import *
 
 from clip_dnd import *
@@ -39,9 +41,12 @@ class wxColourDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxColourData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxColourData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetChooseFull(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)
         return val
@@ -193,6 +198,27 @@ class wxFileDialog(wxFileDialogPtr):
 
 
 
+class wxMultiChoiceDialogPtr(wxDialogPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetSelections(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxMultiChoiceDialog_SetSelections,(self,) + _args, _kwargs)
+        return val
+    def GetSelections(self, *_args, **_kwargs):
+        val = apply(cmndlgsc.wxMultiChoiceDialog_GetSelections,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxMultiChoiceDialog instance at %s>" % (self.this,)
+class wxMultiChoiceDialog(wxMultiChoiceDialogPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(cmndlgsc.new_wxMultiChoiceDialog,_args,_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
 class wxSingleChoiceDialogPtr(wxDialogPtr):
     def __init__(self,this):
         self.this = this
@@ -248,9 +274,12 @@ class wxFontDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxFontData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxFontData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableEffects(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)
         return val
@@ -404,9 +433,12 @@ class wxFindReplaceDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,cmndlgsc=cmndlgsc):
-        if self.thisown == 1 :
-            cmndlgsc.delete_wxFindReplaceData(self)
+    def __del__(self, delfunc=cmndlgsc.delete_wxFindReplaceData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetFindString(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs)
         return val
@@ -462,7 +494,7 @@ class wxFindReplaceDialog(wxFindReplaceDialogPtr):
 def wxPreFindReplaceDialog(*_args,**_kwargs):
     val = wxFindReplaceDialogPtr(apply(cmndlgsc.new_wxPreFindReplaceDialog,_args,_kwargs))
     val.thisown = 1
-    val._setOORInfo(self)
+    val._setOORInfo(val)
     return val
 
 
@@ -474,6 +506,7 @@ def wxPreFindReplaceDialog(*_args,**_kwargs):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+wxCHOICEDLG_STYLE = cmndlgsc.wxCHOICEDLG_STYLE
 wxFR_DOWN = cmndlgsc.wxFR_DOWN
 wxFR_WHOLEWORD = cmndlgsc.wxFR_WHOLEWORD
 wxFR_MATCHCASE = cmndlgsc.wxFR_MATCHCASE