Added $(OVERRIDEFLAGS) to the end of the flags so default flags can be overridden.

[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 5ccdc674b9879e4e7a7e05cc6fc96835a34fedc4..2ec2d3f5161df70cac70669e8e2cdfcf39a5b537 100644 (file)
--- a/utils/wxPython/src/msw/controls2.py
+++ b/utils/wxPython/src/msw/controls2.py
@@ -10,7 +10,7 @@ from gdi import *
 from events import *
 
 from controls import *
-import wxp
+import wx
 class wxListItemPtr :
     def __init__(self,this):
         self.this = this
@@ -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,10 +188,6 @@ 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)
         return val
@@ -232,6 +232,9 @@ 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
@@ -295,9 +298,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
@@ -313,7 +313,7 @@ class wxListCtrl(wxListCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)
 
 
 
@@ -581,6 +581,17 @@ class wxTreeCtrlPtr(wxControlPtr):
     def EndEditLabel(self,arg0,*args):
         val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
         return val
+    def SetItemBold(self,arg0,*args):
+        val = apply(controls2c.wxTreeCtrl_SetItemBold,(self.this,arg0.this,)+args)
+        return val
+    def IsBold(self,arg0):
+        val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this)
+        return val
+    def HitTest(self,arg0):
+        val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
+        val = wxTreeItemIdPtr(val)
+        val.thisown = 1
+        return val
     def __repr__(self):
         return "<C wxTreeCtrl instance>"
 class wxTreeCtrl(wxTreeCtrlPtr):
@@ -593,7 +604,7 @@ class wxTreeCtrl(wxTreeCtrlPtr):
         args = tuple(argl)
         self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
         self.thisown = 1
-        wxp._StdWindowCallbacks(self)
+        wx._StdWindowCallbacks(self)