reSWIGged

[wxWidgets.git] / wxPython / wxPython / _controls.py

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index 64af482caf4a32fd18f6e3ccead49d7134ed8668..842703bad416f6943f15bebee3e07ff169138545 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -127,6 +127,7 @@ wxTE_HT_BEYOND = wx._controls.TE_HT_BEYOND
 wxOutOfRangeTextCoord = wx._controls.OutOfRangeTextCoord
 wxInvalidTextCoord = wx._controls.InvalidTextCoord
 wxTextAttr = wx._controls.TextAttr
 wxOutOfRangeTextCoord = wx._controls.OutOfRangeTextCoord
 wxInvalidTextCoord = wx._controls.InvalidTextCoord
 wxTextAttr = wx._controls.TextAttr

+wxTextAttr_Merge = wx._controls.TextAttr_Merge

 wxTextAttr_Combine = wx._controls.TextAttr_Combine
 wxTextCtrl = wx._controls.TextCtrl
 wxPreTextCtrl = wx._controls.PreTextCtrl
 wxTextAttr_Combine = wx._controls.TextAttr_Combine
 wxTextCtrl = wx._controls.TextCtrl
 wxPreTextCtrl = wx._controls.PreTextCtrl