Changed order of #ifdefs to get native version on OS/2, even if

[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 e08cc477264f9b4cc8e13e828c584a130ea37c0b..235ffa1debcf02b0ca2e5e0f38635e100ad66e32 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
+from clip_dnd import *
+
 from events import *
 
 from controls import *
@@ -414,6 +416,12 @@ class wxTreeCtrlPtr(wxControlPtr):
     def SetStateImageList(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeCtrl_SetStateImageList,(self,) + _args, _kwargs)
         return val
+    def GetSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetSpacing,(self,) + _args, _kwargs)
+        return val
+    def SetSpacing(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetSpacing,(self,) + _args, _kwargs)
+        return val
     def GetItemText(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeCtrl_GetItemText,(self,) + _args, _kwargs)
         return val
@@ -468,8 +476,8 @@ class wxTreeCtrlPtr(wxControlPtr):
         val = apply(controls2c.wxTreeCtrl_GetSelection,(self,) + _args, _kwargs)
         if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
         return val
-    def GetParent(self, *_args, **_kwargs):
-        val = apply(controls2c.wxTreeCtrl_GetParent,(self,) + _args, _kwargs)
+    def GetItemParent(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_GetItemParent,(self,) + _args, _kwargs)
         if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
         return val
     def GetSelections(self, *_args, **_kwargs):
@@ -584,6 +592,18 @@ class wxTreeCtrlPtr(wxControlPtr):
         val = apply(controls2c.wxTreeCtrl_HitTest,(self,) + _args, _kwargs)
         if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
         return val
+    def SetItemTextColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemTextColour,(self,) + _args, _kwargs)
+        return val
+    def SetItemBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def SetItemFont(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemFont,(self,) + _args, _kwargs)
+        return val
+    def SetItemDropHighlight(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeCtrl_SetItemDropHighlight,(self,) + _args, _kwargs)
+        return val
     def GetBoundingRect(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeCtrl_GetBoundingRect,(self,) + _args, _kwargs)
         return val
@@ -662,3 +682,8 @@ 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
+wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
+wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
+wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
+wxTreeItemIcon_SelectedExpanded = controls2c.wxTreeItemIcon_SelectedExpanded
+wxTreeItemIcon_Max = controls2c.wxTreeItemIcon_Max