wxUniversal fixes:

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

diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index f5dc4bd723805e691ee034ad8b5849119ec29d89..a972112caae6e8bc6b535a574efced401a789d1a 100644 (file)
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -1232,7 +1232,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)
@@ -1433,6 +1432,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_EDITABLE = controls2c.wxDIRCTRL_EDITABLE
+wxDIRCTRL_EDIT_LABELS = controls2c.wxDIRCTRL_EDIT_LABELS
 wxID_TREECTRL = controls2c.wxID_TREECTRL
 wxID_FILTERLISTCTRL = controls2c.wxID_FILTERLISTCTRL