fixed font-matching bug in wxFontList::FindOrCreateFont for wxGTK when

[wxWidgets.git] / utils / wxPython / src / msw / controls2.py

diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py
index d8fea80238f25bb6081ddbb8d6f1d27f7cb5c2ac..895358d569d5d6bd11f01d47dbd9ee970eeec962 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -343,9 +343,12 @@ class wxTreeItemDataPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self):
-        if self.thisown == 1 :
-            controls2c.delete_wxTreeItemData(self.this)
+    def GetData(self):
+        val = controls2c.wxTreeItemData_GetData(self.this)
+        return val
+    def SetData(self,arg0):
+        val = controls2c.wxTreeItemData_SetData(self.this,arg0)
+        return val
     def GetId(self):
         val = controls2c.wxTreeItemData_GetId(self.this)
         val = wxTreeItemIdPtr(val)
@@ -356,8 +359,8 @@ class wxTreeItemDataPtr :
     def __repr__(self):
         return "<C wxTreeItemData instance>"
 class wxTreeItemData(wxTreeItemDataPtr):
-    def __init__(self) :
-        self.this = controls2c.new_wxTreeItemData()
+    def __init__(self,*args) :
+        self.this = apply(controls2c.new_wxTreeItemData,()+args)
         self.thisown = 1
 
 
@@ -433,10 +436,6 @@ class wxTreeCtrlPtr(wxControlPtr):
     def GetItemSelectedImage(self,arg0):
         val = controls2c.wxTreeCtrl_GetItemSelectedImage(self.this,arg0.this)
         return val
-    def GetItemData(self,arg0):
-        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
-        val = wxTreeItemDataPtr(val)
-        return val
     def SetItemText(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemText(self.this,arg0.this,arg1)
         return val
@@ -446,11 +445,21 @@ class wxTreeCtrlPtr(wxControlPtr):
     def SetItemSelectedImage(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemSelectedImage(self.this,arg0.this,arg1)
         return val
+    def SetItemHasChildren(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+        return val
+    def GetItemData(self,arg0):
+        val = controls2c.wxTreeCtrl_GetItemData(self.this,arg0.this)
+        val = wxTreeItemDataPtr(val)
+        return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_SetItemData(self.this,arg0.this,arg1.this)
         return val
-    def SetItemHasChildren(self,arg0,*args):
-        val = apply(controls2c.wxTreeCtrl_SetItemHasChildren,(self.this,arg0.this,)+args)
+    def GetPyData(self,arg0):
+        val = controls2c.wxTreeCtrl_GetPyData(self.this,arg0.this)
+        return val
+    def SetPyData(self,arg0,arg1):
+        val = controls2c.wxTreeCtrl_SetPyData(self.this,arg0.this,arg1)
         return val
     def IsVisible(self,arg0):
         val = controls2c.wxTreeCtrl_IsVisible(self.this,arg0.this)
@@ -479,6 +488,9 @@ class wxTreeCtrlPtr(wxControlPtr):
         val = wxTreeItemIdPtr(val)
         val.thisown = 1
         return val
+    def GetChildrenCount(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_GetChildrenCount,(self.this,arg0.this,)+args)
+        return val
     def GetFirstChild(self,arg0,arg1):
         val = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
         return val
@@ -603,6 +615,19 @@ class wxTreeCtrlPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxTreeCtrl instance>"
+    
+    # Redefine a couple methods that SWIG gets a bit confused on...
+    def GetFirstChild(self,arg0,arg1):
+        val1, val2 = controls2c.wxTreeCtrl_GetFirstChild(self.this,arg0.this,arg1)
+        val1 = wxTreeItemIdPtr(val1)
+        val1.thisown = 1
+        return (val1,val2)
+    def GetNextChild(self,arg0,arg1):
+        val1, val2 = controls2c.wxTreeCtrl_GetNextChild(self.this,arg0.this,arg1)
+        val1 = wxTreeItemIdPtr(val1)
+        val1.thisown = 1
+        return (val1,val2)
+
 class wxTreeCtrl(wxTreeCtrlPtr):
     def __init__(self,arg0,*args) :
         argl = map(None,args)
@@ -631,6 +656,7 @@ wxLIST_MASK_IMAGE = controls2c.wxLIST_MASK_IMAGE
 wxLIST_MASK_DATA = controls2c.wxLIST_MASK_DATA
 wxLIST_MASK_WIDTH = controls2c.wxLIST_MASK_WIDTH
 wxLIST_MASK_FORMAT = controls2c.wxLIST_MASK_FORMAT
+wxLIST_MASK_STATE = controls2c.wxLIST_MASK_STATE
 wxLIST_STATE_DONTCARE = controls2c.wxLIST_STATE_DONTCARE
 wxLIST_STATE_DROPHILITED = controls2c.wxLIST_STATE_DROPHILITED
 wxLIST_STATE_FOCUSED = controls2c.wxLIST_STATE_FOCUSED