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 ac552d120dd6bb13df03d586c025513b630bfc9c..895358d569d5d6bd11f01d47dbd9ee970eeec962 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -163,6 +163,10 @@ class wxListCtrlPtr(wxControlPtr):
     def EndEditLabel(self,arg0):
         val = controls2c.wxListCtrl_EndEditLabel(self.this,arg0)
         return val
+    def GetEditControl(self):
+        val = controls2c.wxListCtrl_GetEditControl(self.this)
+        val = wxTextCtrlPtr(val)
+        return val
     def EnsureVisible(self,arg0):
         val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0)
         return val
@@ -184,18 +188,15 @@ class wxListCtrlPtr(wxControlPtr):
     def GetCountPerPage(self):
         val = controls2c.wxListCtrl_GetCountPerPage(self.this)
         return val
-    def GetEditControl(self):
-        val = controls2c.wxListCtrl_GetEditControl(self.this)
-        val = wxTextCtrlPtr(val)
-        return val
     def GetImageList(self,arg0):
         val = controls2c.wxListCtrl_GetImageList(self.this,arg0)
+        val = wxImageListPtr(val)
         return val
     def GetItemData(self,arg0):
         val = controls2c.wxListCtrl_GetItemData(self.this,arg0)
         return val
-    def GetItem(self):
-        val = controls2c.wxListCtrl_GetItem(self.this)
+    def GetItem(self,arg0):
+        val = controls2c.wxListCtrl_GetItem(self.this,arg0)
         val = wxListItemPtr(val)
         val.thisown = 1
         return val
@@ -232,14 +233,17 @@ class wxListCtrlPtr(wxControlPtr):
         val = wxColourPtr(val)
         val.thisown = 1
         return val
+    def SetTextColour(self,arg0):
+        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
+        return val
     def GetTopItem(self):
         val = controls2c.wxListCtrl_GetTopItem(self.this)
         return val
     def HitTest(self,arg0):
         val = controls2c.wxListCtrl_HitTest(self.this,arg0.this)
         return val
-    def InsertColumnWithInfo(self,arg0,arg1):
-        val = controls2c.wxListCtrl_InsertColumnWithInfo(self.this,arg0,arg1.this)
+    def InsertColumnWith(self,arg0,arg1):
+        val = controls2c.wxListCtrl_InsertColumnWith(self.this,arg0,arg1.this)
         return val
     def InsertColumn(self,arg0,arg1,*args):
         val = apply(controls2c.wxListCtrl_InsertColumn,(self.this,arg0,arg1,)+args)
@@ -269,13 +273,13 @@ class wxListCtrlPtr(wxControlPtr):
         val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1)
         return val
     def SetImageList(self,arg0,arg1):
-        val = controls2c.wxListCtrl_SetImageList(self.this,arg0,arg1)
+        val = controls2c.wxListCtrl_SetImageList(self.this,arg0.this,arg1)
         return val
     def SetItem(self,arg0):
         val = controls2c.wxListCtrl_SetItem(self.this,arg0.this)
         return val
-    def SetItemString(self,arg0,arg1,arg2,*args):
-        val = apply(controls2c.wxListCtrl_SetItemString,(self.this,arg0,arg1,arg2,)+args)
+    def SetStringItem(self,arg0,arg1,arg2,*args):
+        val = apply(controls2c.wxListCtrl_SetStringItem,(self.this,arg0,arg1,arg2,)+args)
         return val
     def SetItemData(self,arg0,arg1):
         val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1)
@@ -295,9 +299,6 @@ class wxListCtrlPtr(wxControlPtr):
     def SetSingleStyle(self,arg0,*args):
         val = apply(controls2c.wxListCtrl_SetSingleStyle,(self.this,arg0,)+args)
         return val
-    def SetTextColour(self,arg0):
-        val = controls2c.wxListCtrl_SetTextColour(self.this,arg0.this)
-        return val
     def SetWindowStyleFlag(self,arg0):
         val = controls2c.wxListCtrl_SetWindowStyleFlag(self.this,arg0)
         return val
@@ -342,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)
@@ -355,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
 
 
@@ -411,15 +415,17 @@ class wxTreeCtrlPtr(wxControlPtr):
         return val
     def GetImageList(self):
         val = controls2c.wxTreeCtrl_GetImageList(self.this)
+        val = wxImageListPtr(val)
         return val
     def GetStateImageList(self):
         val = controls2c.wxTreeCtrl_GetStateImageList(self.this)
+        val = wxImageListPtr(val)
         return val
     def SetImageList(self,arg0):
-        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0)
+        val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0.this)
         return val
     def SetStateImageList(self,arg0):
-        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0)
+        val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0.this)
         return val
     def GetItemText(self,arg0):
         val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this)
@@ -430,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
@@ -443,9 +445,22 @@ 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 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)
         return val
@@ -473,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
@@ -543,6 +561,9 @@ class wxTreeCtrlPtr(wxControlPtr):
     def Delete(self,arg0):
         val = controls2c.wxTreeCtrl_Delete(self.this,arg0.this)
         return val
+    def DeleteChildren(self,arg0):
+        val = controls2c.wxTreeCtrl_DeleteChildren(self.this,arg0.this)
+        return val
     def DeleteAllItems(self):
         val = controls2c.wxTreeCtrl_DeleteAllItems(self.this)
         return val
@@ -594,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)
@@ -617,3 +651,46 @@ class wxTreeCtrl(wxTreeCtrlPtr):
 
 #-------------- VARIABLE WRAPPERS ------------------
 
+wxLIST_MASK_TEXT = controls2c.wxLIST_MASK_TEXT
+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
+wxLIST_STATE_SELECTED = controls2c.wxLIST_STATE_SELECTED
+wxLIST_STATE_CUT = controls2c.wxLIST_STATE_CUT
+wxLIST_HITTEST_ABOVE = controls2c.wxLIST_HITTEST_ABOVE
+wxLIST_HITTEST_BELOW = controls2c.wxLIST_HITTEST_BELOW
+wxLIST_HITTEST_NOWHERE = controls2c.wxLIST_HITTEST_NOWHERE
+wxLIST_HITTEST_ONITEMICON = controls2c.wxLIST_HITTEST_ONITEMICON
+wxLIST_HITTEST_ONITEMLABEL = controls2c.wxLIST_HITTEST_ONITEMLABEL
+wxLIST_HITTEST_ONITEMRIGHT = controls2c.wxLIST_HITTEST_ONITEMRIGHT
+wxLIST_HITTEST_ONITEMSTATEICON = controls2c.wxLIST_HITTEST_ONITEMSTATEICON
+wxLIST_HITTEST_TOLEFT = controls2c.wxLIST_HITTEST_TOLEFT
+wxLIST_HITTEST_TORIGHT = controls2c.wxLIST_HITTEST_TORIGHT
+wxLIST_HITTEST_ONITEM = controls2c.wxLIST_HITTEST_ONITEM
+wxLIST_NEXT_ABOVE = controls2c.wxLIST_NEXT_ABOVE
+wxLIST_NEXT_ALL = controls2c.wxLIST_NEXT_ALL
+wxLIST_NEXT_BELOW = controls2c.wxLIST_NEXT_BELOW
+wxLIST_NEXT_LEFT = controls2c.wxLIST_NEXT_LEFT
+wxLIST_NEXT_RIGHT = controls2c.wxLIST_NEXT_RIGHT
+wxLIST_ALIGN_DEFAULT = controls2c.wxLIST_ALIGN_DEFAULT
+wxLIST_ALIGN_LEFT = controls2c.wxLIST_ALIGN_LEFT
+wxLIST_ALIGN_TOP = controls2c.wxLIST_ALIGN_TOP
+wxLIST_ALIGN_SNAP_TO_GRID = controls2c.wxLIST_ALIGN_SNAP_TO_GRID
+wxLIST_FORMAT_LEFT = controls2c.wxLIST_FORMAT_LEFT
+wxLIST_FORMAT_RIGHT = controls2c.wxLIST_FORMAT_RIGHT
+wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE
+wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER
+wxLIST_AUTOSIZE = controls2c.wxLIST_AUTOSIZE
+wxLIST_AUTOSIZE_USEHEADER = controls2c.wxLIST_AUTOSIZE_USEHEADER
+wxLIST_RECT_BOUNDS = controls2c.wxLIST_RECT_BOUNDS
+wxLIST_RECT_ICON = controls2c.wxLIST_RECT_ICON
+wxLIST_RECT_LABEL = controls2c.wxLIST_RECT_LABEL
+wxLIST_FIND_UP = controls2c.wxLIST_FIND_UP
+wxLIST_FIND_DOWN = controls2c.wxLIST_FIND_DOWN
+wxLIST_FIND_LEFT = controls2c.wxLIST_FIND_LEFT
+wxLIST_FIND_RIGHT = controls2c.wxLIST_FIND_RIGHT