X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94082a71f84ab25defd0b31ff60e9993b73df66a..5a07e9748288d199216af61dcac67d45011e36fe:/wxPython/src/gtk/controls2.py?ds=inline

diff --git a/wxPython/src/gtk/controls2.py b/wxPython/src/gtk/controls2.py
index c23d04975b..78042cd466 100644
--- a/wxPython/src/gtk/controls2.py
+++ b/wxPython/src/gtk/controls2.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
+from fonts import *
+
 from clip_dnd import *
 
 from events import *
@@ -346,8 +348,8 @@ class wxListEventPtr(wxNotifyEventPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def GetCode(self, *_args, **_kwargs):
-        val = apply(controls2c.wxListEvent_GetCode,(self,) + _args, _kwargs)
+    def GetKeyCode(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListEvent_GetKeyCode,(self,) + _args, _kwargs)
         return val
     def GetIndex(self, *_args, **_kwargs):
         val = apply(controls2c.wxListEvent_GetIndex,(self,) + _args, _kwargs)
@@ -419,6 +421,7 @@ class wxListEventPtr(wxNotifyEventPtr):
         raise AttributeError,name
     def __repr__(self):
         return "<C wxListEvent instance at %s>" % (self.this,)
+    GetCode = GetKeyCode
 class wxListEvent(wxListEventPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controls2c.new_wxListEvent,_args,_kwargs)
@@ -606,13 +609,27 @@ class wxListCtrlPtr(wxControlPtr):
     def ScrollList(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_ScrollList,(self,) + _args, _kwargs)
         return val
+    def SetItemTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemTextColour,(self,) + _args, _kwargs)
+        return val
+    def GetItemTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def SetItemBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_SetItemBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def GetItemBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxListCtrl_GetItemBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
     def SortItems(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_SortItems,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxListCtrl instance at %s>" % (self.this,)
     
-    def GetItem(self, *_args, **_kwargs):
+    def GetColumn(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)
         if val is not None: val.thisown = 1
         return val
@@ -620,7 +637,7 @@ class wxListCtrlPtr(wxControlPtr):
     
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
-        val.thisown = 1
+        if val is not None: val.thisown = 1
         return val
     
     
@@ -653,6 +670,16 @@ class wxListCtrlPtr(wxControlPtr):
 
     def ClearColumnImage(self, col):
         self.SetColumnImage(col, -1)
+
+    def Append(self, entry):
+        '''Append an item to the list control.  The entry parameter should be a
+           sequence with an item for each column'''
+        if len(entry):
+            pos = self.GetItemCount()
+            self.InsertStringItem(pos, str(entry[0]))
+            for i in range(1, len(entry)):
+                self.SetStringItem(pos, i, str(entry[i]))
+            return pos
     
 class wxListCtrl(wxListCtrlPtr):
     def __init__(self,*_args,**_kwargs):
@@ -833,14 +860,15 @@ class wxTreeEventPtr(wxNotifyEventPtr):
         val = apply(controls2c.wxTreeEvent_GetKeyEvent,(self,) + _args, _kwargs)
         if val: val = wxKeyEventPtr(val) 
         return val
-    def GetCode(self, *_args, **_kwargs):
-        val = apply(controls2c.wxTreeEvent_GetCode,(self,) + _args, _kwargs)
+    def GetKeyCode(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_GetKeyCode,(self,) + _args, _kwargs)
         return val
     def GetLabel(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeEvent_GetLabel,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxTreeEvent instance at %s>" % (self.this,)
+    GetCode = GetKeyCode
 class wxTreeEvent(wxTreeEventPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controls2c.new_wxTreeEvent,_args,_kwargs)
@@ -1202,7 +1230,6 @@ class wxGenericDirCtrlPtr(wxControlPtr):
         return val
     def GetTreeCtrl(self, *_args, **_kwargs):
         val = apply(controls2c.wxGenericDirCtrl_GetTreeCtrl,(self,) + _args, _kwargs)
-        if val: val = wxTreeCtrlPtr(val) 
         return val
     def GetFilterListCtrl(self, *_args, **_kwargs):
         val = apply(controls2c.wxGenericDirCtrl_GetFilterListCtrl,(self,) + _args, _kwargs)
@@ -1403,3 +1430,6 @@ wxDIRCTRL_DIR_ONLY = controls2c.wxDIRCTRL_DIR_ONLY
 wxDIRCTRL_SELECT_FIRST = controls2c.wxDIRCTRL_SELECT_FIRST
 wxDIRCTRL_SHOW_FILTERS = controls2c.wxDIRCTRL_SHOW_FILTERS
 wxDIRCTRL_3D_INTERNAL = controls2c.wxDIRCTRL_3D_INTERNAL
+wxDIRCTRL_EDIT_LABELS = controls2c.wxDIRCTRL_EDIT_LABELS
+wxID_TREECTRL = controls2c.wxID_TREECTRL
+wxID_FILTERLISTCTRL = controls2c.wxID_FILTERLISTCTRL