reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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
+wxTextAttr_Merge = wx._controls.TextAttr_Merge
 wxTextAttr_Combine = wx._controls.TextAttr_Combine
 wxTextCtrl = wx._controls.TextCtrl
 wxPreTextCtrl = wx._controls.PreTextCtrl

wxPython/wxPython/_core.py

@@ -231,6 +231,7 @@ wxPD_SMOOTH = wx._core.PD_SMOOTH
 wxPD_CAN_SKIP = wx._core.PD_CAN_SKIP
 wxDD_NEW_DIR_BUTTON = wx._core.DD_NEW_DIR_BUTTON
 wxDD_DEFAULT_STYLE = wx._core.DD_DEFAULT_STYLE
+wxDD_CHANGE_DIR = wx._core.DD_CHANGE_DIR
 wxMENU_TEAROFF = wx._core.MENU_TEAROFF
 wxMB_DOCKABLE = wx._core.MB_DOCKABLE
 wxNO_FULL_REPAINT_ON_RESIZE = wx._core.NO_FULL_REPAINT_ON_RESIZE

wxPython/wxPython/_gdi.py

@@ -20,6 +20,9 @@ del sys, _wx
 
 # Now assign all the reverse-renamed names:
 wxGDIObject = wx._gdi.GDIObject
+wxC2S_NAME = wx._gdi.C2S_NAME
+wxC2S_CSS_SYNTAX = wx._gdi.C2S_CSS_SYNTAX
+wxC2S_HTML_SYNTAX = wx._gdi.C2S_HTML_SYNTAX
 wxColour = wx._gdi.Colour
 wxNamedColour = wx._gdi.NamedColour
 wxColourRGB = wx._gdi.ColourRGB

wxPython/wxPython/_windows.py

@@ -186,6 +186,7 @@ wxColourData = wx._windows.ColourData
 wxColourDialog = wx._windows.ColourDialog
 wxGetColourFromUser = wx._windows.GetColourFromUser
 wxDirDialog = wx._windows.DirDialog
+wxPreDirDialog = wx._windows.PreDirDialog
 wxFileDialog = wx._windows.FileDialog
 wxCHOICEDLG_STYLE = wx._windows.CHOICEDLG_STYLE
 wxMultiChoiceDialog = wx._windows.MultiChoiceDialog