Regenerated the renamers with the new build_renamers.py

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

diff --git a/wxPython/contrib/gizmos/_gizmos_rename.i b/wxPython/contrib/gizmos/_gizmos_rename.i
index b4d7b797f58fdee643c7b074b0d58ec18567b385..9b04bf8d017c210890c2b83f159576ff19394336 100644 (file)
--- a/wxPython/contrib/gizmos/_gizmos_rename.i
+++ b/wxPython/contrib/gizmos/_gizmos_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(DS_MANAGE_SCROLLBARS)               wxDS_MANAGE_SCROLLBARS;
 %rename(DS_DRAG_CORNER)                     wxDS_DRAG_CORNER;

diff --git a/wxPython/contrib/glcanvas/_glcanvas_rename.i b/wxPython/contrib/glcanvas/_glcanvas_rename.i
index dbe9d6e6883d4a3eb728c6f2b3ddd2c3d5fcbdcf..a7bf32000b67c3e54a3a272c0bdec4b31335048b 100644 (file)
--- a/wxPython/contrib/glcanvas/_glcanvas_rename.i
+++ b/wxPython/contrib/glcanvas/_glcanvas_rename.i
@@ -1,10 +1,10 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(GLContext)                          wxGLContext;
-%rename(GLCanvasWithContext)                wxGLCanvasWithContext;
 %rename(GLCanvas)                           wxGLCanvas;
+%rename(GLCanvasWithContext)                wxGLCanvasWithContext;
 
 #endif

diff --git a/wxPython/contrib/ogl/_ogl_rename.i b/wxPython/contrib/ogl/_ogl_rename.i
index f77bcabf804ac3537e63c970880fce8f9e6ca00b..c02b9f190e6eae6d530c20e38d7b272aae3ac60b 100644 (file)
--- a/wxPython/contrib/ogl/_ogl_rename.i
+++ b/wxPython/contrib/ogl/_ogl_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(ShapeRegion)                        wxShapeRegion;
 %rename(PyShapeEvtHandler)                  wxPyShapeEvtHandler;

diff --git a/wxPython/contrib/stc/_stc_rename.i b/wxPython/contrib/stc/_stc_rename.i
index 892530a65d51626d66e2fe86b6c8140591c5ae65..4cc94bf4c25b088db0bf9e8641e336b8befb5fee 100644 (file)
--- a/wxPython/contrib/stc/_stc_rename.i
+++ b/wxPython/contrib/stc/_stc_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(STC_USE_POPUP)                      wxSTC_USE_POPUP;
 %rename(STC_INVALID_POSITION)               wxSTC_INVALID_POSITION;

diff --git a/wxPython/contrib/xrc/_xrc_rename.i b/wxPython/contrib/xrc/_xrc_rename.i
index d54e50ae46ee943f42b7a815ce5ed2b6fa259b14..7940f09d3302543fa15fc08f3a8df2aaaf5235f1 100644 (file)
--- a/wxPython/contrib/xrc/_xrc_rename.i
+++ b/wxPython/contrib/xrc/_xrc_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(XRC_USE_LOCALE)                     wxXRC_USE_LOCALE;
 %rename(XRC_NO_SUBCLASSING)                 wxXRC_NO_SUBCLASSING;

diff --git a/wxPython/src/_calendar_rename.i b/wxPython/src/_calendar_rename.i
index 072354fa1a23bb2d56b20f744de8a00be44121d8..5c312d1882c486baef74f4242d179bdcc0bc5d3a 100644 (file)
--- a/wxPython/src/_calendar_rename.i
+++ b/wxPython/src/_calendar_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(CAL_SUNDAY_FIRST)                   wxCAL_SUNDAY_FIRST;
 %rename(CAL_MONDAY_FIRST)                   wxCAL_MONDAY_FIRST;

diff --git a/wxPython/src/_controls_rename.i b/wxPython/src/_controls_rename.i
index 297e951e082a5909d320cd2c2e95c5ba645e6333..6eae0ff8634213608f375c3ba77c3d7d544fdcfa 100644 (file)
--- a/wxPython/src/_controls_rename.i
+++ b/wxPython/src/_controls_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(BU_LEFT)                            wxBU_LEFT;
 %rename(BU_TOP)                             wxBU_TOP;

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 766dfebe2f2121bc9e21e96c2d024fa9d658a62c..4b0a245fa21f48a71c4491089682f860c0c6a6af 100644 (file)
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(NOT_FOUND)                          wxNOT_FOUND;
 %rename(VSCROLL)                            wxVSCROLL;

diff --git a/wxPython/src/_gdi_rename.i b/wxPython/src/_gdi_rename.i
index 30c32b058f41b5d28811e1f4661da615c8709744..a7146e4e0c38ebccb82dc8c423d47f7d3f734336 100644 (file)
--- a/wxPython/src/_gdi_rename.i
+++ b/wxPython/src/_gdi_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(GDIObject)                          wxGDIObject;
 %rename(Colour)                             wxColour;

diff --git a/wxPython/src/_grid_rename.i b/wxPython/src/_grid_rename.i
index 4ec2aecf436d951f012cf4feea3fd751cc9c67be..058d3ebece4021388f9ab6d2578aed173038a300 100644 (file)
--- a/wxPython/src/_grid_rename.i
+++ b/wxPython/src/_grid_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(GRID_VALUE_STRING)                  wxGRID_VALUE_STRING;
 %rename(GRID_VALUE_BOOL)                    wxGRID_VALUE_BOOL;

diff --git a/wxPython/src/_html_rename.i b/wxPython/src/_html_rename.i
index b3bbfefc922e5a40f44ee03b997a467386d580a8..3f04c0c3e7fb79cc42ea437991b39da4e27165d1 100644 (file)
--- a/wxPython/src/_html_rename.i
+++ b/wxPython/src/_html_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(HTML_ALIGN_LEFT)                    wxHTML_ALIGN_LEFT;
 %rename(HTML_ALIGN_CENTER)                  wxHTML_ALIGN_CENTER;

diff --git a/wxPython/src/_misc_rename.i b/wxPython/src/_misc_rename.i
index 0112f75771666a29b4b64aef8129196b9969f076..103fa59d06d61bb1c5b9ef3961a2332ad3f1e03a 100644 (file)
--- a/wxPython/src/_misc_rename.i
+++ b/wxPython/src/_misc_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(SYS_OEM_FIXED_FONT)                 wxSYS_OEM_FIXED_FONT;
 %rename(SYS_ANSI_FIXED_FONT)                wxSYS_ANSI_FIXED_FONT;

diff --git a/wxPython/src/_windows_rename.i b/wxPython/src/_windows_rename.i
index f70b55e027910a22b0742136b9d8888db1161c05..e72f8c2326942d6a54973735cfa483823245d3f3 100644 (file)
--- a/wxPython/src/_windows_rename.i
+++ b/wxPython/src/_windows_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(Panel)                              wxPanel;
 %rename(ScrolledWindow)                     wxScrolledWindow;

diff --git a/wxPython/src/_wizard_rename.i b/wxPython/src/_wizard_rename.i
index 765c31c720d2f4b3a419de99b71b4f89e8093f9d..11b8a4ca673eb5fd82729c7b83d10bb85a26527e 100644 (file)
--- a/wxPython/src/_wizard_rename.i
+++ b/wxPython/src/_wizard_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS
 
 %rename(WIZARD_EX_HELPBUTTON)               wxWIZARD_EX_HELPBUTTON;
 %rename(WizardEvent)                        wxWizardEvent;

diff --git a/wxPython/wxPython/calendar.py b/wxPython/wxPython/calendar.py
index dee3ce8f4435c0aa07c0841b25308c25ec576ac6..51660af88a8fd0fc5252d52f6792c689ad7f1f76 100644 (file)
--- a/wxPython/wxPython/calendar.py
+++ b/wxPython/wxPython/calendar.py
@@ -35,9 +35,9 @@ wxCAL_HITTEST_SURROUNDING_WEEK = wx.calendar.CAL_HITTEST_SURROUNDING_WEEK
 wxCAL_BORDER_NONE = wx.calendar.CAL_BORDER_NONE
 wxCAL_BORDER_SQUARE = wx.calendar.CAL_BORDER_SQUARE
 wxCAL_BORDER_ROUND = wx.calendar.CAL_BORDER_ROUND
-wxCalendarDateAttrBorder = wx.calendar.CalendarDateAttrBorder
 wxCalendarDateAttr = wx.calendar.CalendarDateAttr
 wxCalendarDateAttrPtr = wx.calendar.CalendarDateAttrPtr
+wxCalendarDateAttrBorder = wx.calendar.CalendarDateAttrBorder
 wxCalendarEvent = wx.calendar.CalendarEvent
 wxCalendarEventPtr = wx.calendar.CalendarEventPtr
 wxEVT_CALENDAR_DOUBLECLICKED = wx.calendar.wxEVT_CALENDAR_DOUBLECLICKED
@@ -46,9 +46,9 @@ wxEVT_CALENDAR_DAY_CHANGED = wx.calendar.wxEVT_CALENDAR_DAY_CHANGED
 wxEVT_CALENDAR_MONTH_CHANGED = wx.calendar.wxEVT_CALENDAR_MONTH_CHANGED
 wxEVT_CALENDAR_YEAR_CHANGED = wx.calendar.wxEVT_CALENDAR_YEAR_CHANGED
 wxEVT_CALENDAR_WEEKDAY_CLICKED = wx.calendar.wxEVT_CALENDAR_WEEKDAY_CLICKED
-wxPreCalendarCtrl = wx.calendar.PreCalendarCtrl
 wxCalendarCtrl = wx.calendar.CalendarCtrl
 wxCalendarCtrlPtr = wx.calendar.CalendarCtrlPtr
+wxPreCalendarCtrl = wx.calendar.PreCalendarCtrl
 
 
 d = globals()

diff --git a/wxPython/wxPython/controls.py b/wxPython/wxPython/controls.py
index 0f97fbd9ce95ae5a801389d7dc711a1110220709..d7b9421d89ea780d174999cdd66df6ad0b158f22 100644 (file)
--- a/wxPython/wxPython/controls.py
+++ b/wxPython/wxPython/controls.py
@@ -25,54 +25,54 @@ wxBU_RIGHT = wx.controls.BU_RIGHT
 wxBU_BOTTOM = wx.controls.BU_BOTTOM
 wxBU_EXACTFIT = wx.controls.BU_EXACTFIT
 wxBU_AUTODRAW = wx.controls.BU_AUTODRAW
-wxPreButton = wx.controls.PreButton
-wxButton_GetDefaultSize = wx.controls.Button_GetDefaultSize
 wxButton = wx.controls.Button
 wxButtonPtr = wx.controls.ButtonPtr
-wxPreBitmapButton = wx.controls.PreBitmapButton
+wxPreButton = wx.controls.PreButton
+wxButton_GetDefaultSize = wx.controls.Button_GetDefaultSize
 wxBitmapButton = wx.controls.BitmapButton
 wxBitmapButtonPtr = wx.controls.BitmapButtonPtr
+wxPreBitmapButton = wx.controls.PreBitmapButton
 wxCHK_2STATE = wx.controls.CHK_2STATE
 wxCHK_3STATE = wx.controls.CHK_3STATE
 wxCHK_ALLOW_3RD_STATE_FOR_USER = wx.controls.CHK_ALLOW_3RD_STATE_FOR_USER
 wxCHK_UNCHECKED = wx.controls.CHK_UNCHECKED
 wxCHK_CHECKED = wx.controls.CHK_CHECKED
 wxCHK_UNDETERMINED = wx.controls.CHK_UNDETERMINED
-wxPreCheckBox = wx.controls.PreCheckBox
 wxCheckBox = wx.controls.CheckBox
 wxCheckBoxPtr = wx.controls.CheckBoxPtr
-wxPreChoice = wx.controls.PreChoice
+wxPreCheckBox = wx.controls.PreCheckBox
 wxChoice = wx.controls.Choice
 wxChoicePtr = wx.controls.ChoicePtr
-wxPreComboBox = wx.controls.PreComboBox
+wxPreChoice = wx.controls.PreChoice
 wxComboBox = wx.controls.ComboBox
 wxComboBoxPtr = wx.controls.ComboBoxPtr
+wxPreComboBox = wx.controls.PreComboBox
 wxGA_HORIZONTAL = wx.controls.GA_HORIZONTAL
 wxGA_VERTICAL = wx.controls.GA_VERTICAL
 wxGA_SMOOTH = wx.controls.GA_SMOOTH
 wxGA_PROGRESSBAR = wx.controls.GA_PROGRESSBAR
-wxPreGauge = wx.controls.PreGauge
 wxGauge = wx.controls.Gauge
 wxGaugePtr = wx.controls.GaugePtr
-wxPreStaticBox = wx.controls.PreStaticBox
+wxPreGauge = wx.controls.PreGauge
 wxStaticBox = wx.controls.StaticBox
 wxStaticBoxPtr = wx.controls.StaticBoxPtr
-wxPreStaticLine = wx.controls.PreStaticLine
-wxStaticLine_GetDefaultSize = wx.controls.StaticLine_GetDefaultSize
+wxPreStaticBox = wx.controls.PreStaticBox
 wxStaticLine = wx.controls.StaticLine
 wxStaticLinePtr = wx.controls.StaticLinePtr
-wxPreStaticText = wx.controls.PreStaticText
+wxPreStaticLine = wx.controls.PreStaticLine
+wxStaticLine_GetDefaultSize = wx.controls.StaticLine_GetDefaultSize
 wxStaticText = wx.controls.StaticText
 wxStaticTextPtr = wx.controls.StaticTextPtr
-wxPreStaticBitmap = wx.controls.PreStaticBitmap
+wxPreStaticText = wx.controls.PreStaticText
 wxStaticBitmap = wx.controls.StaticBitmap
 wxStaticBitmapPtr = wx.controls.StaticBitmapPtr
-wxPreListBox = wx.controls.PreListBox
+wxPreStaticBitmap = wx.controls.PreStaticBitmap
 wxListBox = wx.controls.ListBox
 wxListBoxPtr = wx.controls.ListBoxPtr
-wxPreCheckListBox = wx.controls.PreCheckListBox
+wxPreListBox = wx.controls.PreListBox
 wxCheckListBox = wx.controls.CheckListBox
 wxCheckListBoxPtr = wx.controls.CheckListBoxPtr
+wxPreCheckListBox = wx.controls.PreCheckListBox
 wxTE_NO_VSCROLL = wx.controls.TE_NO_VSCROLL
 wxTE_AUTO_SCROLL = wx.controls.TE_AUTO_SCROLL
 wxTE_READONLY = wx.controls.TE_READONLY
@@ -109,45 +109,45 @@ wxTEXT_ATTR_ALIGNMENT = wx.controls.TEXT_ATTR_ALIGNMENT
 wxTEXT_ATTR_LEFT_INDENT = wx.controls.TEXT_ATTR_LEFT_INDENT
 wxTEXT_ATTR_RIGHT_INDENT = wx.controls.TEXT_ATTR_RIGHT_INDENT
 wxTEXT_ATTR_TABS = wx.controls.TEXT_ATTR_TABS
-wxTextAttr_Combine = wx.controls.TextAttr_Combine
 wxTextAttr = wx.controls.TextAttr
 wxTextAttrPtr = wx.controls.TextAttrPtr
-wxPreTextCtrl = wx.controls.PreTextCtrl
+wxTextAttr_Combine = wx.controls.TextAttr_Combine
 wxTextCtrl = wx.controls.TextCtrl
 wxTextCtrlPtr = wx.controls.TextCtrlPtr
+wxPreTextCtrl = wx.controls.PreTextCtrl
 wxEVT_COMMAND_TEXT_UPDATED = wx.controls.wxEVT_COMMAND_TEXT_UPDATED
 wxEVT_COMMAND_TEXT_ENTER = wx.controls.wxEVT_COMMAND_TEXT_ENTER
 wxEVT_COMMAND_TEXT_URL = wx.controls.wxEVT_COMMAND_TEXT_URL
 wxEVT_COMMAND_TEXT_MAXLEN = wx.controls.wxEVT_COMMAND_TEXT_MAXLEN
 wxTextUrlEvent = wx.controls.TextUrlEvent
 wxTextUrlEventPtr = wx.controls.TextUrlEventPtr
-wxPreScrollBar = wx.controls.PreScrollBar
 wxScrollBar = wx.controls.ScrollBar
 wxScrollBarPtr = wx.controls.ScrollBarPtr
+wxPreScrollBar = wx.controls.PreScrollBar
 wxSP_HORIZONTAL = wx.controls.SP_HORIZONTAL
 wxSP_VERTICAL = wx.controls.SP_VERTICAL
 wxSP_ARROW_KEYS = wx.controls.SP_ARROW_KEYS
 wxSP_WRAP = wx.controls.SP_WRAP
-wxPreSpinButton = wx.controls.PreSpinButton
 wxSpinButton = wx.controls.SpinButton
 wxSpinButtonPtr = wx.controls.SpinButtonPtr
-wxPreSpinCtrl = wx.controls.PreSpinCtrl
+wxPreSpinButton = wx.controls.PreSpinButton
 wxSpinCtrl = wx.controls.SpinCtrl
 wxSpinCtrlPtr = wx.controls.SpinCtrlPtr
+wxPreSpinCtrl = wx.controls.PreSpinCtrl
 wxEVT_COMMAND_SPINCTRL_UPDATED = wx.controls.wxEVT_COMMAND_SPINCTRL_UPDATED
-wxPreRadioBox = wx.controls.PreRadioBox
 wxRadioBox = wx.controls.RadioBox
 wxRadioBoxPtr = wx.controls.RadioBoxPtr
-wxPreRadioButton = wx.controls.PreRadioButton
+wxPreRadioBox = wx.controls.PreRadioBox
 wxRadioButton = wx.controls.RadioButton
 wxRadioButtonPtr = wx.controls.RadioButtonPtr
-wxPreSlider = wx.controls.PreSlider
+wxPreRadioButton = wx.controls.PreRadioButton
 wxSlider = wx.controls.Slider
 wxSliderPtr = wx.controls.SliderPtr
+wxPreSlider = wx.controls.PreSlider
 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx.controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
-wxPreToggleButton = wx.controls.PreToggleButton
 wxToggleButton = wx.controls.ToggleButton
 wxToggleButtonPtr = wx.controls.ToggleButtonPtr
+wxPreToggleButton = wx.controls.PreToggleButton
 wxBookCtrl = wx.controls.BookCtrl
 wxBookCtrlPtr = wx.controls.BookCtrlPtr
 wxBookCtrlEvent = wx.controls.BookCtrlEvent
@@ -162,9 +162,9 @@ wxNB_HITTEST_NOWHERE = wx.controls.NB_HITTEST_NOWHERE
 wxNB_HITTEST_ONICON = wx.controls.NB_HITTEST_ONICON
 wxNB_HITTEST_ONLABEL = wx.controls.NB_HITTEST_ONLABEL
 wxNB_HITTEST_ONITEM = wx.controls.NB_HITTEST_ONITEM
-wxPreNotebook = wx.controls.PreNotebook
 wxNotebook = wx.controls.Notebook
 wxNotebookPtr = wx.controls.NotebookPtr
+wxPreNotebook = wx.controls.PreNotebook
 wxNotebookEvent = wx.controls.NotebookEvent
 wxNotebookEventPtr = wx.controls.NotebookEventPtr
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wx.controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
@@ -175,9 +175,9 @@ wxLB_BOTTOM = wx.controls.LB_BOTTOM
 wxLB_LEFT = wx.controls.LB_LEFT
 wxLB_RIGHT = wx.controls.LB_RIGHT
 wxLB_ALIGN_MASK = wx.controls.LB_ALIGN_MASK
-wxPreListbook = wx.controls.PreListbook
 wxListbook = wx.controls.Listbook
 wxListbookPtr = wx.controls.ListbookPtr
+wxPreListbook = wx.controls.PreListbook
 wxListbookEvent = wx.controls.ListbookEvent
 wxListbookEventPtr = wx.controls.ListbookEventPtr
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx.controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
@@ -204,9 +204,9 @@ wxToolBarToolBase = wx.controls.ToolBarToolBase
 wxToolBarToolBasePtr = wx.controls.ToolBarToolBasePtr
 wxToolBarBase = wx.controls.ToolBarBase
 wxToolBarBasePtr = wx.controls.ToolBarBasePtr
-wxPreToolBar = wx.controls.PreToolBar
 wxToolBar = wx.controls.ToolBar
 wxToolBarPtr = wx.controls.ToolBarPtr
+wxPreToolBar = wx.controls.PreToolBar
 wxLC_VRULES = wx.controls.LC_VRULES
 wxLC_HRULES = wx.controls.LC_HRULES
 wxLC_ICON = wx.controls.LC_ICON
@@ -303,12 +303,12 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = wx.controls.wxEVT_COMMAND_LIST_COL_BEGIN_DRA
 wxEVT_COMMAND_LIST_COL_DRAGGING = wx.controls.wxEVT_COMMAND_LIST_COL_DRAGGING
 wxEVT_COMMAND_LIST_COL_END_DRAG = wx.controls.wxEVT_COMMAND_LIST_COL_END_DRAG
 wxEVT_COMMAND_LIST_ITEM_FOCUSED = wx.controls.wxEVT_COMMAND_LIST_ITEM_FOCUSED
-wxPreListCtrl = wx.controls.PreListCtrl
 wxListCtrl = wx.controls.ListCtrl
 wxListCtrlPtr = wx.controls.ListCtrlPtr
-wxPreListView = wx.controls.PreListView
+wxPreListCtrl = wx.controls.PreListCtrl
 wxListView = wx.controls.ListView
 wxListViewPtr = wx.controls.ListViewPtr
+wxPreListView = wx.controls.PreListView
 wxTR_NO_BUTTONS = wx.controls.TR_NO_BUTTONS
 wxTR_HAS_BUTTONS = wx.controls.TR_HAS_BUTTONS
 wxTR_NO_LINES = wx.controls.TR_NO_LINES
@@ -367,22 +367,23 @@ wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wx.controls.wxEVT_COMMAND_TREE_ITEM_RIGHT_
 wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wx.controls.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
 wxEVT_COMMAND_TREE_END_DRAG = wx.controls.wxEVT_COMMAND_TREE_END_DRAG
 wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = wx.controls.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK
+wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = wx.controls.wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP
 wxTreeEvent = wx.controls.TreeEvent
 wxTreeEventPtr = wx.controls.TreeEventPtr
-wxPreTreeCtrl = wx.controls.PreTreeCtrl
 wxTreeCtrl = wx.controls.TreeCtrl
 wxTreeCtrlPtr = wx.controls.TreeCtrlPtr
+wxPreTreeCtrl = wx.controls.PreTreeCtrl
 wxDIRCTRL_DIR_ONLY = wx.controls.DIRCTRL_DIR_ONLY
 wxDIRCTRL_SELECT_FIRST = wx.controls.DIRCTRL_SELECT_FIRST
 wxDIRCTRL_SHOW_FILTERS = wx.controls.DIRCTRL_SHOW_FILTERS
 wxDIRCTRL_3D_INTERNAL = wx.controls.DIRCTRL_3D_INTERNAL
 wxDIRCTRL_EDIT_LABELS = wx.controls.DIRCTRL_EDIT_LABELS
-wxPreGenericDirCtrl = wx.controls.PreGenericDirCtrl
 wxGenericDirCtrl = wx.controls.GenericDirCtrl
 wxGenericDirCtrlPtr = wx.controls.GenericDirCtrlPtr
-wxPreDirFilterListCtrl = wx.controls.PreDirFilterListCtrl
+wxPreGenericDirCtrl = wx.controls.PreGenericDirCtrl
 wxDirFilterListCtrl = wx.controls.DirFilterListCtrl
 wxDirFilterListCtrlPtr = wx.controls.DirFilterListCtrlPtr
+wxPreDirFilterListCtrl = wx.controls.PreDirFilterListCtrl
 wxPyControl = wx.controls.PyControl
 wxPyControlPtr = wx.controls.PyControlPtr
 wxFRAME_EX_CONTEXTHELP = wx.controls.FRAME_EX_CONTEXTHELP
@@ -395,18 +396,18 @@ wxContextHelp = wx.controls.ContextHelp
 wxContextHelpPtr = wx.controls.ContextHelpPtr
 wxContextHelpButton = wx.controls.ContextHelpButton
 wxContextHelpButtonPtr = wx.controls.ContextHelpButtonPtr
-wxHelpProvider_Set = wx.controls.HelpProvider_Set
-wxHelpProvider_Get = wx.controls.HelpProvider_Get
 wxHelpProvider = wx.controls.HelpProvider
 wxHelpProviderPtr = wx.controls.HelpProviderPtr
+wxHelpProvider_Set = wx.controls.HelpProvider_Set
+wxHelpProvider_Get = wx.controls.HelpProvider_Get
 wxSimpleHelpProvider = wx.controls.SimpleHelpProvider
 wxSimpleHelpProviderPtr = wx.controls.SimpleHelpProviderPtr
+wxDragImage = wx.controls.DragImage
+wxDragImagePtr = wx.controls.DragImagePtr
 wxDragIcon = wx.controls.DragIcon
 wxDragString = wx.controls.DragString
 wxDragTreeItem = wx.controls.DragTreeItem
 wxDragListItem = wx.controls.DragListItem
-wxDragImage = wx.controls.DragImage
-wxDragImagePtr = wx.controls.DragImagePtr
 
 
 d = globals()

diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index df103685665f2ee9897f4c4045f45aa587d7babf..3a01af3ac57c2ba52c32bc54a88e69d1958c0b2b 100644 (file)
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -629,15 +629,15 @@ wxRealPoint = wx.core.RealPoint
 wxRealPointPtr = wx.core.RealPointPtr
 wxPoint = wx.core.Point
 wxPointPtr = wx.core.PointPtr
-wxRectPP = wx.core.RectPP
-wxRectPS = wx.core.RectPS
 wxRect = wx.core.Rect
 wxRectPtr = wx.core.RectPtr
+wxRectPP = wx.core.RectPP
+wxRectPS = wx.core.RectPS
 wxIntersectRect = wx.core.IntersectRect
-wxPoint2DCopy = wx.core.Point2DCopy
-wxPoint2DFromPoint = wx.core.Point2DFromPoint
 wxPoint2D = wx.core.Point2D
 wxPoint2DPtr = wx.core.Point2DPtr
+wxPoint2DCopy = wx.core.Point2DCopy
+wxPoint2DFromPoint = wx.core.Point2DFromPoint
 wxDefaultPosition = wx.core.DefaultPosition
 wxDefaultSize = wx.core.DefaultSize
 wxFromStart = wx.core.FromStart
@@ -653,11 +653,11 @@ wxCPPFileSystemHandler = wx.core.CPPFileSystemHandler
 wxCPPFileSystemHandlerPtr = wx.core.CPPFileSystemHandlerPtr
 wxFileSystemHandler = wx.core.FileSystemHandler
 wxFileSystemHandlerPtr = wx.core.FileSystemHandlerPtr
+wxFileSystem = wx.core.FileSystem
+wxFileSystemPtr = wx.core.FileSystemPtr
 wxFileSystem_AddHandler = wx.core.FileSystem_AddHandler
 wxFileSystem_CleanUpHandlers = wx.core.FileSystem_CleanUpHandlers
 wxFileSystem_FileNameToURL = wx.core.FileSystem_FileNameToURL
-wxFileSystem = wx.core.FileSystem
-wxFileSystemPtr = wx.core.FileSystemPtr
 wxFileSystem_URLToFileName = wx.core.FileSystem_URLToFileName
 wxInternetFSHandler = wx.core.InternetFSHandler
 wxInternetFSHandlerPtr = wx.core.InternetFSHandlerPtr
@@ -666,14 +666,16 @@ wxZipFSHandlerPtr = wx.core.ZipFSHandlerPtr
 __wxMemoryFSHandler_AddFile_wxImage = wx.core.__wxMemoryFSHandler_AddFile_wxImage
 __wxMemoryFSHandler_AddFile_wxBitmap = wx.core.__wxMemoryFSHandler_AddFile_wxBitmap
 __wxMemoryFSHandler_AddFile_Data = wx.core.__wxMemoryFSHandler_AddFile_Data
-wxMemoryFSHandler_RemoveFile = wx.core.MemoryFSHandler_RemoveFile
 wxMemoryFSHandler = wx.core.MemoryFSHandler
 wxMemoryFSHandlerPtr = wx.core.MemoryFSHandlerPtr
+wxMemoryFSHandler_RemoveFile = wx.core.MemoryFSHandler_RemoveFile
 wxImageHandler = wx.core.ImageHandler
 wxImageHandlerPtr = wx.core.ImageHandlerPtr
-wxImageHistogram_MakeKey = wx.core.ImageHistogram_MakeKey
 wxImageHistogram = wx.core.ImageHistogram
 wxImageHistogramPtr = wx.core.ImageHistogramPtr
+wxImageHistogram_MakeKey = wx.core.ImageHistogram_MakeKey
+wxImage = wx.core.Image
+wxImagePtr = wx.core.ImagePtr
 wxImageFromMime = wx.core.ImageFromMime
 wxImageFromStream = wx.core.ImageFromStream
 wxImageFromStreamMime = wx.core.ImageFromStreamMime
@@ -687,8 +689,6 @@ wxImage_AddHandler = wx.core.Image_AddHandler
 wxImage_InsertHandler = wx.core.Image_InsertHandler
 wxImage_RemoveHandler = wx.core.Image_RemoveHandler
 wxImage_GetImageExtWildcard = wx.core.Image_GetImageExtWildcard
-wxImage = wx.core.Image
-wxImagePtr = wx.core.ImagePtr
 wxInitAllImageHandlers = wx.core.InitAllImageHandlers
 wxNullImage = wx.core.NullImage
 wxIMAGE_OPTION_BMP_FORMAT = wx.core.IMAGE_OPTION_BMP_FORMAT
@@ -905,14 +905,14 @@ wxDropFilesEvent = wx.core.DropFilesEvent
 wxDropFilesEventPtr = wx.core.DropFilesEventPtr
 wxUPDATE_UI_PROCESS_ALL = wx.core.UPDATE_UI_PROCESS_ALL
 wxUPDATE_UI_PROCESS_SPECIFIED = wx.core.UPDATE_UI_PROCESS_SPECIFIED
+wxUpdateUIEvent = wx.core.UpdateUIEvent
+wxUpdateUIEventPtr = wx.core.UpdateUIEventPtr
 wxUpdateUIEvent_SetUpdateInterval = wx.core.UpdateUIEvent_SetUpdateInterval
 wxUpdateUIEvent_GetUpdateInterval = wx.core.UpdateUIEvent_GetUpdateInterval
 wxUpdateUIEvent_CanUpdate = wx.core.UpdateUIEvent_CanUpdate
 wxUpdateUIEvent_ResetUpdateTime = wx.core.UpdateUIEvent_ResetUpdateTime
 wxUpdateUIEvent_SetMode = wx.core.UpdateUIEvent_SetMode
 wxUpdateUIEvent_GetMode = wx.core.UpdateUIEvent_GetMode
-wxUpdateUIEvent = wx.core.UpdateUIEvent
-wxUpdateUIEventPtr = wx.core.UpdateUIEventPtr
 wxSysColourChangedEvent = wx.core.SysColourChangedEvent
 wxSysColourChangedEventPtr = wx.core.SysColourChangedEventPtr
 wxMouseCaptureChangedEvent = wx.core.MouseCaptureChangedEvent
@@ -933,11 +933,11 @@ wxContextMenuEvent = wx.core.ContextMenuEvent
 wxContextMenuEventPtr = wx.core.ContextMenuEventPtr
 wxIDLE_PROCESS_ALL = wx.core.IDLE_PROCESS_ALL
 wxIDLE_PROCESS_SPECIFIED = wx.core.IDLE_PROCESS_SPECIFIED
+wxIdleEvent = wx.core.IdleEvent
+wxIdleEventPtr = wx.core.IdleEventPtr
 wxIdleEvent_SetMode = wx.core.IdleEvent_SetMode
 wxIdleEvent_GetMode = wx.core.IdleEvent_GetMode
 wxIdleEvent_CanSend = wx.core.IdleEvent_CanSend
-wxIdleEvent = wx.core.IdleEvent
-wxIdleEventPtr = wx.core.IdleEventPtr
 wxPyEvent = wx.core.PyEvent
 wxPyEventPtr = wx.core.PyEventPtr
 wxPyCommandEvent = wx.core.PyCommandEvent
@@ -948,6 +948,8 @@ wxPYAPP_ASSERT_DIALOG = wx.core.PYAPP_ASSERT_DIALOG
 wxPYAPP_ASSERT_LOG = wx.core.PYAPP_ASSERT_LOG
 wxPRINT_WINDOWS = wx.core.PRINT_WINDOWS
 wxPRINT_POSTSCRIPT = wx.core.PRINT_POSTSCRIPT
+wxPyApp = wx.core.PyApp
+wxPyAppPtr = wx.core.PyAppPtr
 wxPyApp_GetMacSupportPCMenuShortcuts = wx.core.PyApp_GetMacSupportPCMenuShortcuts
 wxPyApp_GetMacAboutMenuItemId = wx.core.PyApp_GetMacAboutMenuItemId
 wxPyApp_GetMacPreferencesMenuItemId = wx.core.PyApp_GetMacPreferencesMenuItemId
@@ -959,8 +961,6 @@ wxPyApp_SetMacPreferencesMenuItemId = wx.core.PyApp_SetMacPreferencesMenuItemId
 wxPyApp_SetMacExitMenuItemId = wx.core.PyApp_SetMacExitMenuItemId
 wxPyApp_SetMacHelpMenuTitleName = wx.core.PyApp_SetMacHelpMenuTitleName
 wxPyApp_GetComCtl32Version = wx.core.PyApp_GetComCtl32Version
-wxPyApp = wx.core.PyApp
-wxPyAppPtr = wx.core.PyAppPtr
 wxExit = wx.core.Exit
 wxYield = wx.core.Yield
 wxYieldIfNeeded = wx.core.YieldIfNeeded
@@ -976,22 +976,22 @@ wxAcceleratorTablePtr = wx.core.AcceleratorTablePtr
 wxNullAcceleratorTable = wx.core.NullAcceleratorTable
 wxGetAccelFromString = wx.core.GetAccelFromString
 wxPanelNameStr = wx.core.PanelNameStr
+wxWindow = wx.core.Window
+wxWindowPtr = wx.core.WindowPtr
 wxPreWindow = wx.core.PreWindow
 wxWindow_NewControlId = wx.core.Window_NewControlId
 wxWindow_NextControlId = wx.core.Window_NextControlId
 wxWindow_PrevControlId = wx.core.Window_PrevControlId
 wxWindow_FindFocus = wx.core.Window_FindFocus
 wxWindow_GetCapture = wx.core.Window_GetCapture
-wxWindow = wx.core.Window
-wxWindowPtr = wx.core.WindowPtr
 wxFindWindowById = wx.core.FindWindowById
 wxFindWindowByName = wx.core.FindWindowByName
 wxFindWindowByLabel = wx.core.FindWindowByLabel
 wxWindow_FromHWND = wx.core.Window_FromHWND
-wxValidator_IsSilent = wx.core.Validator_IsSilent
-wxValidator_SetBellOnError = wx.core.Validator_SetBellOnError
 wxValidator = wx.core.Validator
 wxValidatorPtr = wx.core.ValidatorPtr
+wxValidator_IsSilent = wx.core.Validator_IsSilent
+wxValidator_SetBellOnError = wx.core.Validator_SetBellOnError
 wxPyValidator = wx.core.PyValidator
 wxPyValidatorPtr = wx.core.PyValidatorPtr
 wxDefaultValidator = wx.core.DefaultValidator
@@ -999,22 +999,22 @@ wxMenu = wx.core.Menu
 wxMenuPtr = wx.core.MenuPtr
 wxMenuBar = wx.core.MenuBar
 wxMenuBarPtr = wx.core.MenuBarPtr
-wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
-wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth
 wxMenuItem = wx.core.MenuItem
 wxMenuItemPtr = wx.core.MenuItemPtr
-wxPreControl = wx.core.PreControl
+wxMenuItem_GetLabelFromText = wx.core.MenuItem_GetLabelFromText
+wxMenuItem_GetDefaultMarginWidth = wx.core.MenuItem_GetDefaultMarginWidth
 wxControl = wx.core.Control
 wxControlPtr = wx.core.ControlPtr
+wxPreControl = wx.core.PreControl
 wxItemContainer = wx.core.ItemContainer
 wxItemContainerPtr = wx.core.ItemContainerPtr
 wxControlWithItems = wx.core.ControlWithItems
 wxControlWithItemsPtr = wx.core.ControlWithItemsPtr
+wxSizerItem = wx.core.SizerItem
+wxSizerItemPtr = wx.core.SizerItemPtr
 wxSizerItemSpacer = wx.core.SizerItemSpacer
 wxSizerItemWindow = wx.core.SizerItemWindow
 wxSizerItemSizer = wx.core.SizerItemSizer
-wxSizerItem = wx.core.SizerItem
-wxSizerItemPtr = wx.core.SizerItemPtr
 wxSizer = wx.core.Sizer
 wxSizerPtr = wx.core.SizerPtr
 wxPySizer = wx.core.PySizer
@@ -1035,11 +1035,11 @@ wxGBPositionPtr = wx.core.GBPositionPtr
 wxGBSpan = wx.core.GBSpan
 wxGBSpanPtr = wx.core.GBSpanPtr
 wxDefaultSpan = wx.core.DefaultSpan
+wxGBSizerItem = wx.core.GBSizerItem
+wxGBSizerItemPtr = wx.core.GBSizerItemPtr
 wxGBSizerItemWindow = wx.core.GBSizerItemWindow
 wxGBSizerItemSizer = wx.core.GBSizerItemSizer
 wxGBSizerItemSpacer = wx.core.GBSizerItemSpacer
-wxGBSizerItem = wx.core.GBSizerItem
-wxGBSizerItemPtr = wx.core.GBSizerItemPtr
 wxGridBagSizer = wx.core.GridBagSizer
 wxGridBagSizerPtr = wx.core.GridBagSizerPtr
 wxLeft = wx.core.Left

diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py
index 87007b0eacd71f2be01498ca1f0dc38951e310b6..ba9457b842011acdcc5871782004934ab4df4172 100644 (file)
--- a/wxPython/wxPython/gdi.py
+++ b/wxPython/wxPython/gdi.py
@@ -21,10 +21,10 @@ del sys, _wx
 # Now assign all the reverse-renamed names:
 wxGDIObject = wx.gdi.GDIObject
 wxGDIObjectPtr = wx.gdi.GDIObjectPtr
-wxNamedColour = wx.gdi.NamedColour
-wxColourRGB = wx.gdi.ColourRGB
 wxColour = wx.gdi.Colour
 wxColourPtr = wx.gdi.ColourPtr
+wxNamedColour = wx.gdi.NamedColour
+wxColourRGB = wx.gdi.ColourRGB
 wxPalette = wx.gdi.Palette
 wxPalettePtr = wx.gdi.PalettePtr
 wxPen = wx.gdi.Pen
@@ -33,40 +33,40 @@ wxPyPen = wx.gdi.PyPen
 wxPyPenPtr = wx.gdi.PyPenPtr
 wxBrush = wx.gdi.Brush
 wxBrushPtr = wx.gdi.BrushPtr
+wxBitmap = wx.gdi.Bitmap
+wxBitmapPtr = wx.gdi.BitmapPtr
 wxEmptyBitmap = wx.gdi.EmptyBitmap
 wxBitmapFromIcon = wx.gdi.BitmapFromIcon
 wxBitmapFromImage = wx.gdi.BitmapFromImage
 wxBitmapFromXPMData = wx.gdi.BitmapFromXPMData
 wxBitmapFromBits = wx.gdi.BitmapFromBits
-wxBitmap = wx.gdi.Bitmap
-wxBitmapPtr = wx.gdi.BitmapPtr
-wxMaskColour = wx.gdi.MaskColour
 wxMask = wx.gdi.Mask
 wxMaskPtr = wx.gdi.MaskPtr
+wxMaskColour = wx.gdi.MaskColour
+wxIcon = wx.gdi.Icon
+wxIconPtr = wx.gdi.IconPtr
 wxEmptyIcon = wx.gdi.EmptyIcon
 wxIconFromLocation = wx.gdi.IconFromLocation
 wxIconFromBitmap = wx.gdi.IconFromBitmap
 wxIconFromXPMData = wx.gdi.IconFromXPMData
-wxIcon = wx.gdi.Icon
-wxIconPtr = wx.gdi.IconPtr
 wxIconLocation = wx.gdi.IconLocation
 wxIconLocationPtr = wx.gdi.IconLocationPtr
-wxIconBundleFromFile = wx.gdi.IconBundleFromFile
-wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon
 wxIconBundle = wx.gdi.IconBundle
 wxIconBundlePtr = wx.gdi.IconBundlePtr
+wxIconBundleFromFile = wx.gdi.IconBundleFromFile
+wxIconBundleFromIcon = wx.gdi.IconBundleFromIcon
+wxCursor = wx.gdi.Cursor
+wxCursorPtr = wx.gdi.CursorPtr
 wxStockCursor = wx.gdi.StockCursor
 wxCursorFromImage = wx.gdi.CursorFromImage
 wxCursorFromBits = wx.gdi.CursorFromBits
-wxCursor = wx.gdi.Cursor
-wxCursorPtr = wx.gdi.CursorPtr
 wxOutRegion = wx.gdi.OutRegion
 wxPartRegion = wx.gdi.PartRegion
 wxInRegion = wx.gdi.InRegion
-wxRegionFromBitmap = wx.gdi.RegionFromBitmap
-wxRegionFromPoints = wx.gdi.RegionFromPoints
 wxRegion = wx.gdi.Region
 wxRegionPtr = wx.gdi.RegionPtr
+wxRegionFromBitmap = wx.gdi.RegionFromBitmap
+wxRegionFromPoints = wx.gdi.RegionFromPoints
 wxRegionIterator = wx.gdi.RegionIterator
 wxRegionIteratorPtr = wx.gdi.RegionIteratorPtr
 wxFONTFAMILY_DEFAULT = wx.gdi.FONTFAMILY_DEFAULT
@@ -156,6 +156,8 @@ wxNativeEncodingInfo = wx.gdi.NativeEncodingInfo
 wxNativeEncodingInfoPtr = wx.gdi.NativeEncodingInfoPtr
 wxGetNativeFontEncoding = wx.gdi.GetNativeFontEncoding
 wxTestFontEncoding = wx.gdi.TestFontEncoding
+wxFontMapper = wx.gdi.FontMapper
+wxFontMapperPtr = wx.gdi.FontMapperPtr
 wxFontMapper_Get = wx.gdi.FontMapper_Get
 wxFontMapper_Set = wx.gdi.FontMapper_Set
 wxFontMapper_GetSupportedEncodingsCount = wx.gdi.FontMapper_GetSupportedEncodingsCount
@@ -163,15 +165,13 @@ wxFontMapper_GetEncoding = wx.gdi.FontMapper_GetEncoding
 wxFontMapper_GetEncodingName = wx.gdi.FontMapper_GetEncodingName
 wxFontMapper_GetEncodingDescription = wx.gdi.FontMapper_GetEncodingDescription
 wxFontMapper_GetDefaultConfigPath = wx.gdi.FontMapper_GetDefaultConfigPath
-wxFontMapper = wx.gdi.FontMapper
-wxFontMapperPtr = wx.gdi.FontMapperPtr
+wxFont = wx.gdi.Font
+wxFontPtr = wx.gdi.FontPtr
 wxFontFromNativeInfo = wx.gdi.FontFromNativeInfo
 wxFontFromNativeInfoString = wx.gdi.FontFromNativeInfoString
 wxFont2 = wx.gdi.Font2
 wxFont_GetDefaultEncoding = wx.gdi.Font_GetDefaultEncoding
 wxFont_SetDefaultEncoding = wx.gdi.Font_SetDefaultEncoding
-wxFont = wx.gdi.Font
-wxFontPtr = wx.gdi.FontPtr
 wxFontEnumerator = wx.gdi.FontEnumerator
 wxFontEnumeratorPtr = wx.gdi.FontEnumeratorPtr
 wxLANGUAGE_DEFAULT = wx.gdi.LANGUAGE_DEFAULT
@@ -415,6 +415,8 @@ wxLOCALE_THOUSANDS_SEP = wx.gdi.LOCALE_THOUSANDS_SEP
 wxLOCALE_DECIMAL_POINT = wx.gdi.LOCALE_DECIMAL_POINT
 wxLOCALE_LOAD_DEFAULT = wx.gdi.LOCALE_LOAD_DEFAULT
 wxLOCALE_CONV_ENCODING = wx.gdi.LOCALE_CONV_ENCODING
+wxLocale = wx.gdi.Locale
+wxLocalePtr = wx.gdi.LocalePtr
 wxLocale_GetSystemLanguage = wx.gdi.Locale_GetSystemLanguage
 wxLocale_GetSystemEncoding = wx.gdi.Locale_GetSystemEncoding
 wxLocale_GetSystemEncodingName = wx.gdi.Locale_GetSystemEncodingName
@@ -423,8 +425,6 @@ wxLocale_GetLanguageInfo = wx.gdi.Locale_GetLanguageInfo
 wxLocale_GetLanguageName = wx.gdi.Locale_GetLanguageName
 wxLocale_FindLanguageInfo = wx.gdi.Locale_FindLanguageInfo
 wxLocale_AddLanguage = wx.gdi.Locale_AddLanguage
-wxLocale = wx.gdi.Locale
-wxLocalePtr = wx.gdi.LocalePtr
 wxGetLocale = wx.gdi.GetLocale
 wxGetTranslation = wx.gdi.GetTranslation
 wxGetTranslation = wx.gdi.GetTranslation
@@ -435,19 +435,19 @@ wxPLATFORM_UNIX = wx.gdi.PLATFORM_UNIX
 wxPLATFORM_WINDOWS = wx.gdi.PLATFORM_WINDOWS
 wxPLATFORM_OS2 = wx.gdi.PLATFORM_OS2
 wxPLATFORM_MAC = wx.gdi.PLATFORM_MAC
+wxEncodingConverter = wx.gdi.EncodingConverter
+wxEncodingConverterPtr = wx.gdi.EncodingConverterPtr
 wxEncodingConverter_GetPlatformEquivalents = wx.gdi.EncodingConverter_GetPlatformEquivalents
 wxEncodingConverter_GetAllEquivalents = wx.gdi.EncodingConverter_GetAllEquivalents
 wxEncodingConverter_CanConvert = wx.gdi.EncodingConverter_CanConvert
-wxEncodingConverter = wx.gdi.EncodingConverter
-wxEncodingConverterPtr = wx.gdi.EncodingConverterPtr
 wxDC = wx.gdi.DC
 wxDCPtr = wx.gdi.DCPtr
-wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC
 wxMemoryDC = wx.gdi.MemoryDC
 wxMemoryDCPtr = wx.gdi.MemoryDCPtr
-wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer
+wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC
 wxBufferedDC = wx.gdi.BufferedDC
 wxBufferedDCPtr = wx.gdi.BufferedDCPtr
+wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer
 wxBufferedPaintDC = wx.gdi.BufferedPaintDC
 wxBufferedPaintDCPtr = wx.gdi.BufferedPaintDCPtr
 wxScreenDC = wx.gdi.ScreenDC
@@ -460,10 +460,10 @@ wxWindowDC = wx.gdi.WindowDC
 wxWindowDCPtr = wx.gdi.WindowDCPtr
 wxMirrorDC = wx.gdi.MirrorDC
 wxMirrorDCPtr = wx.gdi.MirrorDCPtr
-wxPostScriptDC_SetResolution = wx.gdi.PostScriptDC_SetResolution
-wxPostScriptDC_GetResolution = wx.gdi.PostScriptDC_GetResolution
 wxPostScriptDC = wx.gdi.PostScriptDC
 wxPostScriptDCPtr = wx.gdi.PostScriptDCPtr
+wxPostScriptDC_SetResolution = wx.gdi.PostScriptDC_SetResolution
+wxPostScriptDC_GetResolution = wx.gdi.PostScriptDC_GetResolution
 wxMetaFile = wx.gdi.MetaFile
 wxMetaFilePtr = wx.gdi.MetaFilePtr
 wxMetaFileDC = wx.gdi.MetaFileDC

diff --git a/wxPython/wxPython/gizmos.py b/wxPython/wxPython/gizmos.py
index b101082a83e06120d9dc3af12a086a8d267a0254..961564c708df063c772cbde3abedf383e4b10c10 100644 (file)
--- a/wxPython/wxPython/gizmos.py
+++ b/wxPython/wxPython/gizmos.py
@@ -27,9 +27,9 @@ wxDynamicSashSplitEvent = wx.gizmos.DynamicSashSplitEvent
 wxDynamicSashSplitEventPtr = wx.gizmos.DynamicSashSplitEventPtr
 wxDynamicSashUnifyEvent = wx.gizmos.DynamicSashUnifyEvent
 wxDynamicSashUnifyEventPtr = wx.gizmos.DynamicSashUnifyEventPtr
-wxPreDynamicSashWindow = wx.gizmos.PreDynamicSashWindow
 wxDynamicSashWindow = wx.gizmos.DynamicSashWindow
 wxDynamicSashWindowPtr = wx.gizmos.DynamicSashWindowPtr
+wxPreDynamicSashWindow = wx.gizmos.PreDynamicSashWindow
 wxEL_ALLOW_NEW = wx.gizmos.EL_ALLOW_NEW
 wxEL_ALLOW_EDIT = wx.gizmos.EL_ALLOW_EDIT
 wxEL_ALLOW_DELETE = wx.gizmos.EL_ALLOW_DELETE
@@ -48,18 +48,18 @@ wxLED_ALIGN_RIGHT = wx.gizmos.LED_ALIGN_RIGHT
 wxLED_ALIGN_CENTER = wx.gizmos.LED_ALIGN_CENTER
 wxLED_ALIGN_MASK = wx.gizmos.LED_ALIGN_MASK
 wxLED_DRAW_FADED = wx.gizmos.LED_DRAW_FADED
-wxPreLEDNumberCtrl = wx.gizmos.PreLEDNumberCtrl
 wxLEDNumberCtrl = wx.gizmos.LEDNumberCtrl
 wxLEDNumberCtrlPtr = wx.gizmos.LEDNumberCtrlPtr
+wxPreLEDNumberCtrl = wx.gizmos.PreLEDNumberCtrl
 wxTL_ALIGN_LEFT = wx.gizmos.TL_ALIGN_LEFT
 wxTL_ALIGN_RIGHT = wx.gizmos.TL_ALIGN_RIGHT
 wxTL_ALIGN_CENTER = wx.gizmos.TL_ALIGN_CENTER
 wxTREE_HITTEST_ONITEMCOLUMN = wx.gizmos.TREE_HITTEST_ONITEMCOLUMN
 wxTreeListColumnInfo = wx.gizmos.TreeListColumnInfo
 wxTreeListColumnInfoPtr = wx.gizmos.TreeListColumnInfoPtr
-wxPreTreeListCtrl = wx.gizmos.PreTreeListCtrl
 wxTreeListCtrl = wx.gizmos.TreeListCtrl
 wxTreeListCtrlPtr = wx.gizmos.TreeListCtrlPtr
+wxPreTreeListCtrl = wx.gizmos.PreTreeListCtrl
 
 
 d = globals()

diff --git a/wxPython/wxPython/glcanvas.py b/wxPython/wxPython/glcanvas.py
index a5a5de9d482ccf4a81d9e5b5445964b3f3dd982f..96e43a818df2fe85af56922c8aee8c3e5709ae3c 100644 (file)
--- a/wxPython/wxPython/glcanvas.py
+++ b/wxPython/wxPython/glcanvas.py
@@ -37,8 +37,8 @@ WX_GL_MIN_ACCUM_RED = wx.glcanvas.WX_GL_MIN_ACCUM_RED
 WX_GL_MIN_ACCUM_GREEN = wx.glcanvas.WX_GL_MIN_ACCUM_GREEN
 WX_GL_MIN_ACCUM_BLUE = wx.glcanvas.WX_GL_MIN_ACCUM_BLUE
 WX_GL_MIN_ACCUM_ALPHA = wx.glcanvas.WX_GL_MIN_ACCUM_ALPHA
-wxGLCanvasWithContext = wx.glcanvas.GLCanvasWithContext
 wxGLCanvas = wx.glcanvas.GLCanvas
 wxGLCanvasPtr = wx.glcanvas.GLCanvasPtr
+wxGLCanvasWithContext = wx.glcanvas.GLCanvasWithContext
 
 

diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py
index 2cc18cc99864a5fea53bb320b768b854a0546f12..135964f52cb03e2a89f55f381c1755b9f8a44ebe 100644 (file)
--- a/wxPython/wxPython/html.py
+++ b/wxPython/wxPython/html.py
@@ -98,19 +98,19 @@ wxHtmlWidgetCell = wx.html.HtmlWidgetCell
 wxHtmlWidgetCellPtr = wx.html.HtmlWidgetCellPtr
 wxHtmlFilter = wx.html.HtmlFilter
 wxHtmlFilterPtr = wx.html.HtmlFilterPtr
-wxPreHtmlWindow = wx.html.PreHtmlWindow
-wxHtmlWindow_AddFilter = wx.html.HtmlWindow_AddFilter
 wxHtmlWindow = wx.html.HtmlWindow
 wxHtmlWindowPtr = wx.html.HtmlWindowPtr
+wxPreHtmlWindow = wx.html.PreHtmlWindow
+wxHtmlWindow_AddFilter = wx.html.HtmlWindow_AddFilter
 wxHtmlDCRenderer = wx.html.HtmlDCRenderer
 wxHtmlDCRendererPtr = wx.html.HtmlDCRendererPtr
 wxPAGE_ODD = wx.html.PAGE_ODD
 wxPAGE_EVEN = wx.html.PAGE_EVEN
 wxPAGE_ALL = wx.html.PAGE_ALL
-wxHtmlPrintout_AddFilter = wx.html.HtmlPrintout_AddFilter
-wxHtmlPrintout_CleanUpStatics = wx.html.HtmlPrintout_CleanUpStatics
 wxHtmlPrintout = wx.html.HtmlPrintout
 wxHtmlPrintoutPtr = wx.html.HtmlPrintoutPtr
+wxHtmlPrintout_AddFilter = wx.html.HtmlPrintout_AddFilter
+wxHtmlPrintout_CleanUpStatics = wx.html.HtmlPrintout_CleanUpStatics
 wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting
 wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr
 wxHtmlBookRecord = wx.html.HtmlBookRecord

diff --git a/wxPython/wxPython/misc.py b/wxPython/wxPython/misc.py
index 7c7bea1ba1657ffce8696407444e2bc465457f4f..acd2db4db024e0390d034904663821cf1e01fb10 100644 (file)
--- a/wxPython/wxPython/misc.py
+++ b/wxPython/wxPython/misc.py
@@ -110,21 +110,21 @@ wxSYS_SCREEN_TINY = wx.misc.SYS_SCREEN_TINY
 wxSYS_SCREEN_PDA = wx.misc.SYS_SCREEN_PDA
 wxSYS_SCREEN_SMALL = wx.misc.SYS_SCREEN_SMALL
 wxSYS_SCREEN_DESKTOP = wx.misc.SYS_SCREEN_DESKTOP
+wxSystemSettings = wx.misc.SystemSettings
+wxSystemSettingsPtr = wx.misc.SystemSettingsPtr
 wxSystemSettings_GetColour = wx.misc.SystemSettings_GetColour
 wxSystemSettings_GetFont = wx.misc.SystemSettings_GetFont
 wxSystemSettings_GetMetric = wx.misc.SystemSettings_GetMetric
 wxSystemSettings_HasFeature = wx.misc.SystemSettings_HasFeature
 wxSystemSettings_GetScreenType = wx.misc.SystemSettings_GetScreenType
 wxSystemSettings_SetScreenType = wx.misc.SystemSettings_SetScreenType
-wxSystemSettings = wx.misc.SystemSettings
-wxSystemSettingsPtr = wx.misc.SystemSettingsPtr
+wxSystemOptions = wx.misc.SystemOptions
+wxSystemOptionsPtr = wx.misc.SystemOptionsPtr
 wxSystemOptions_SetOption = wx.misc.SystemOptions_SetOption
 wxSystemOptions_SetOptionInt = wx.misc.SystemOptions_SetOptionInt
 wxSystemOptions_GetOption = wx.misc.SystemOptions_GetOption
 wxSystemOptions_GetOptionInt = wx.misc.SystemOptions_GetOptionInt
 wxSystemOptions_HasOption = wx.misc.SystemOptions_HasOption
-wxSystemOptions = wx.misc.SystemOptions
-wxSystemOptionsPtr = wx.misc.SystemOptionsPtr
 wxNewId = wx.misc.NewId
 wxRegisterId = wx.misc.RegisterId
 wxGetCurrentId = wx.misc.GetCurrentId
@@ -186,10 +186,10 @@ wxMutexGuiLeave = wx.misc.MutexGuiLeave
 wxMutexGuiLocker = wx.misc.MutexGuiLocker
 wxMutexGuiLockerPtr = wx.misc.MutexGuiLockerPtr
 wxThread_IsMain = wx.misc.Thread_IsMain
-wxToolTip_Enable = wx.misc.ToolTip_Enable
-wxToolTip_SetDelay = wx.misc.ToolTip_SetDelay
 wxToolTip = wx.misc.ToolTip
 wxToolTipPtr = wx.misc.ToolTipPtr
+wxToolTip_Enable = wx.misc.ToolTip_Enable
+wxToolTip_SetDelay = wx.misc.ToolTip_SetDelay
 wxCaret = wx.misc.Caret
 wxCaretPtr = wx.misc.CaretPtr
 wxCaret_GetBlinkTime = wx.misc.Caret_GetBlinkTime
@@ -204,9 +204,9 @@ wxStopWatch = wx.misc.StopWatch
 wxStopWatchPtr = wx.misc.StopWatchPtr
 wxFileHistory = wx.misc.FileHistory
 wxFileHistoryPtr = wx.misc.FileHistoryPtr
-wxPreSingleInstanceChecker = wx.misc.PreSingleInstanceChecker
 wxSingleInstanceChecker = wx.misc.SingleInstanceChecker
 wxSingleInstanceCheckerPtr = wx.misc.SingleInstanceCheckerPtr
+wxPreSingleInstanceChecker = wx.misc.PreSingleInstanceChecker
 wxDrawWindowOnDC = wx.misc.DrawWindowOnDC
 wxTipProvider = wx.misc.TipProvider
 wxTipProviderPtr = wx.misc.TipProviderPtr
@@ -244,6 +244,8 @@ wxTraceMessages = wx.misc.TraceMessages
 wxTraceResAlloc = wx.misc.TraceResAlloc
 wxTraceRefCount = wx.misc.TraceRefCount
 wxTraceOleCalls = wx.misc.TraceOleCalls
+wxLog = wx.misc.Log
+wxLogPtr = wx.misc.LogPtr
 wxLog_IsEnabled = wx.misc.Log_IsEnabled
 wxLog_EnableLogging = wx.misc.Log_EnableLogging
 wxLog_OnLog = wx.misc.Log_OnLog
@@ -267,8 +269,6 @@ wxLog_IsAllowedTraceMask = wx.misc.Log_IsAllowedTraceMask
 wxLog_GetLogLevel = wx.misc.Log_GetLogLevel
 wxLog_GetTimestamp = wx.misc.Log_GetTimestamp
 wxLog_TimeStamp = wx.misc.Log_TimeStamp
-wxLog = wx.misc.Log
-wxLogPtr = wx.misc.LogPtr
 wxLogStderr = wx.misc.LogStderr
 wxLogStderrPtr = wx.misc.LogStderrPtr
 wxLogTextCtrl = wx.misc.LogTextCtrl
@@ -323,11 +323,11 @@ wxSIGSYS = wx.misc.SIGSYS
 wxSIGPIPE = wx.misc.SIGPIPE
 wxSIGALRM = wx.misc.SIGALRM
 wxSIGTERM = wx.misc.SIGTERM
+wxProcess = wx.misc.Process
+wxProcessPtr = wx.misc.ProcessPtr
 wxProcess_Kill = wx.misc.Process_Kill
 wxProcess_Exists = wx.misc.Process_Exists
 wxProcess_Open = wx.misc.Process_Open
-wxProcess = wx.misc.Process
-wxProcessPtr = wx.misc.ProcessPtr
 wxProcessEvent = wx.misc.ProcessEvent
 wxProcessEventPtr = wx.misc.ProcessEventPtr
 wxEVT_END_PROCESS = wx.misc.wxEVT_END_PROCESS
@@ -351,25 +351,25 @@ wxEVT_JOY_MOVE = wx.misc.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = wx.misc.wxEVT_JOY_ZMOVE
 wxJoystickEvent = wx.misc.JoystickEvent
 wxJoystickEventPtr = wx.misc.JoystickEventPtr
-wxWaveData = wx.misc.WaveData
 wxWave = wx.misc.Wave
 wxWavePtr = wx.misc.WavePtr
+wxWaveData = wx.misc.WaveData
 wxMAILCAP_STANDARD = wx.misc.MAILCAP_STANDARD
 wxMAILCAP_NETSCAPE = wx.misc.MAILCAP_NETSCAPE
 wxMAILCAP_KDE = wx.misc.MAILCAP_KDE
 wxMAILCAP_GNOME = wx.misc.MAILCAP_GNOME
 wxMAILCAP_ALL = wx.misc.MAILCAP_ALL
-wxFileTypeInfoSequence = wx.misc.FileTypeInfoSequence
-wxNullFileTypeInfo = wx.misc.NullFileTypeInfo
 wxFileTypeInfo = wx.misc.FileTypeInfo
 wxFileTypeInfoPtr = wx.misc.FileTypeInfoPtr
-wxFileType_ExpandCommand = wx.misc.FileType_ExpandCommand
+wxFileTypeInfoSequence = wx.misc.FileTypeInfoSequence
+wxNullFileTypeInfo = wx.misc.NullFileTypeInfo
 wxFileType = wx.misc.FileType
 wxFileTypePtr = wx.misc.FileTypePtr
+wxFileType_ExpandCommand = wx.misc.FileType_ExpandCommand
 wxTheMimeTypesManager = wx.misc.TheMimeTypesManager
-wxMimeTypesManager_IsOfType = wx.misc.MimeTypesManager_IsOfType
 wxMimeTypesManager = wx.misc.MimeTypesManager
 wxMimeTypesManagerPtr = wx.misc.MimeTypesManagerPtr
+wxMimeTypesManager_IsOfType = wx.misc.MimeTypesManager_IsOfType
 wxART_TOOLBAR = wx.misc.ART_TOOLBAR
 wxART_MENU = wx.misc.ART_MENU
 wxART_FRAME_ICON = wx.misc.ART_FRAME_ICON
@@ -408,23 +408,23 @@ wxART_QUESTION = wx.misc.ART_QUESTION
 wxART_WARNING = wx.misc.ART_WARNING
 wxART_INFORMATION = wx.misc.ART_INFORMATION
 wxART_MISSING_IMAGE = wx.misc.ART_MISSING_IMAGE
+wxArtProvider = wx.misc.ArtProvider
+wxArtProviderPtr = wx.misc.ArtProviderPtr
 wxArtProvider_PushProvider = wx.misc.ArtProvider_PushProvider
 wxArtProvider_PopProvider = wx.misc.ArtProvider_PopProvider
 wxArtProvider_RemoveProvider = wx.misc.ArtProvider_RemoveProvider
 wxArtProvider_GetBitmap = wx.misc.ArtProvider_GetBitmap
 wxArtProvider_GetIcon = wx.misc.ArtProvider_GetIcon
-wxArtProvider = wx.misc.ArtProvider
-wxArtProviderPtr = wx.misc.ArtProviderPtr
 wxCONFIG_USE_LOCAL_FILE = wx.misc.CONFIG_USE_LOCAL_FILE
 wxCONFIG_USE_GLOBAL_FILE = wx.misc.CONFIG_USE_GLOBAL_FILE
 wxCONFIG_USE_RELATIVE_PATH = wx.misc.CONFIG_USE_RELATIVE_PATH
 wxCONFIG_USE_NO_ESCAPE_CHARACTERS = wx.misc.CONFIG_USE_NO_ESCAPE_CHARACTERS
+wxConfigBase = wx.misc.ConfigBase
+wxConfigBasePtr = wx.misc.ConfigBasePtr
 wxConfigBase_Set = wx.misc.ConfigBase_Set
 wxConfigBase_Get = wx.misc.ConfigBase_Get
 wxConfigBase_Create = wx.misc.ConfigBase_Create
 wxConfigBase_DontCreateOnDemand = wx.misc.ConfigBase_DontCreateOnDemand
-wxConfigBase = wx.misc.ConfigBase
-wxConfigBasePtr = wx.misc.ConfigBasePtr
 wxConfigPathChanger = wx.misc.ConfigPathChanger
 wxConfigPathChangerPtr = wx.misc.ConfigPathChangerPtr
 wxConfig = wx.misc.Config
@@ -432,6 +432,8 @@ wxConfigPtr = wx.misc.ConfigPtr
 wxFileConfig = wx.misc.FileConfig
 wxFileConfigPtr = wx.misc.FileConfigPtr
 wxExpandEnvVars = wx.misc.ExpandEnvVars
+wxDateTime = wx.misc.DateTime
+wxDateTimePtr = wx.misc.DateTimePtr
 wxDateTime_SetCountry = wx.misc.DateTime_SetCountry
 wxDateTime_GetCountry = wx.misc.DateTime_GetCountry
 wxDateTime_IsWestEuropeanCountry = wx.misc.DateTime_IsWestEuropeanCountry
@@ -455,8 +457,8 @@ wxDateTimeFromTimeT = wx.misc.DateTimeFromTimeT
 wxDateTimeFromJDN = wx.misc.DateTimeFromJDN
 wxDateTimeFromHMS = wx.misc.DateTimeFromHMS
 wxDateTimeFromDMY = wx.misc.DateTimeFromDMY
-wxDateTime = wx.misc.DateTime
-wxDateTimePtr = wx.misc.DateTimePtr
+wxTimeSpan = wx.misc.TimeSpan
+wxTimeSpanPtr = wx.misc.TimeSpanPtr
 wxTimeSpan_Seconds = wx.misc.TimeSpan_Seconds
 wxTimeSpan_Second = wx.misc.TimeSpan_Second
 wxTimeSpan_Minutes = wx.misc.TimeSpan_Minutes
@@ -467,8 +469,8 @@ wxTimeSpan_Days = wx.misc.TimeSpan_Days
 wxTimeSpan_Day = wx.misc.TimeSpan_Day
 wxTimeSpan_Weeks = wx.misc.TimeSpan_Weeks
 wxTimeSpan_Week = wx.misc.TimeSpan_Week
-wxTimeSpan = wx.misc.TimeSpan
-wxTimeSpanPtr = wx.misc.TimeSpanPtr
+wxDateSpan = wx.misc.DateSpan
+wxDateSpanPtr = wx.misc.DateSpanPtr
 wxDateSpan_Days = wx.misc.DateSpan_Days
 wxDateSpan_Day = wx.misc.DateSpan_Day
 wxDateSpan_Weeks = wx.misc.DateSpan_Weeks
@@ -477,8 +479,6 @@ wxDateSpan_Months = wx.misc.DateSpan_Months
 wxDateSpan_Month = wx.misc.DateSpan_Month
 wxDateSpan_Years = wx.misc.DateSpan_Years
 wxDateSpan_Year = wx.misc.DateSpan_Year
-wxDateSpan = wx.misc.DateSpan
-wxDateSpanPtr = wx.misc.DateSpanPtr
 wxGetLocalTime = wx.misc.GetLocalTime
 wxGetUTCTime = wx.misc.GetUTCTime
 wxGetCurrentTime = wx.misc.GetCurrentTime
@@ -503,9 +503,9 @@ wxDF_LOCALE = wx.misc.DF_LOCALE
 wxDF_PRIVATE = wx.misc.DF_PRIVATE
 wxDF_HTML = wx.misc.DF_HTML
 wxDF_MAX = wx.misc.DF_MAX
-wxCustomDataFormat = wx.misc.CustomDataFormat
 wxDataFormat = wx.misc.DataFormat
 wxDataFormatPtr = wx.misc.DataFormatPtr
+wxCustomDataFormat = wx.misc.CustomDataFormat
 wxFormatInvalid = wx.misc.FormatInvalid
 wxDataObject = wx.misc.DataObject
 wxDataObjectPtr = wx.misc.DataObjectPtr

diff --git a/wxPython/wxPython/stc.py b/wxPython/wxPython/stc.py
index 44666b97a89aff7bb613aeb14d1bd2d2a0c6bc68..ead2805d386c89beeba6753cb6ae09fca88b87af 100644 (file)
--- a/wxPython/wxPython/stc.py
+++ b/wxPython/wxPython/stc.py
@@ -791,9 +791,9 @@ wxSTC_CMD_PARADOWN = wx.stc.STC_CMD_PARADOWN
 wxSTC_CMD_PARADOWNEXTEND = wx.stc.STC_CMD_PARADOWNEXTEND
 wxSTC_CMD_PARAUP = wx.stc.STC_CMD_PARAUP
 wxSTC_CMD_PARAUPEXTEND = wx.stc.STC_CMD_PARAUPEXTEND
-wxPreStyledTextCtrl = wx.stc.PreStyledTextCtrl
 wxStyledTextCtrl = wx.stc.StyledTextCtrl
 wxStyledTextCtrlPtr = wx.stc.StyledTextCtrlPtr
+wxPreStyledTextCtrl = wx.stc.PreStyledTextCtrl
 wxStyledTextEvent = wx.stc.StyledTextEvent
 wxStyledTextEventPtr = wx.stc.StyledTextEventPtr
 wxEVT_STC_CHANGE = wx.stc.wxEVT_STC_CHANGE

diff --git a/wxPython/wxPython/windows.py b/wxPython/wxPython/windows.py
index d7b8ebed0d38d02186b2655391a9d5e5166231a1..6f30ee2b65cdf3361863c9353422eea9f786c70b 100644 (file)
--- a/wxPython/wxPython/windows.py
+++ b/wxPython/wxPython/windows.py
@@ -19,12 +19,12 @@ del sys, _wx
 
 
 # Now assign all the reverse-renamed names:
-wxPrePanel = wx.windows.PrePanel
 wxPanel = wx.windows.Panel
 wxPanelPtr = wx.windows.PanelPtr
-wxPreScrolledWindow = wx.windows.PreScrolledWindow
+wxPrePanel = wx.windows.PrePanel
 wxScrolledWindow = wx.windows.ScrolledWindow
 wxScrolledWindowPtr = wx.windows.ScrolledWindowPtr
+wxPreScrolledWindow = wx.windows.PreScrolledWindow
 wxFULLSCREEN_NOMENUBAR = wx.windows.FULLSCREEN_NOMENUBAR
 wxFULLSCREEN_NOTOOLBAR = wx.windows.FULLSCREEN_NOTOOLBAR
 wxFULLSCREEN_NOSTATUSBAR = wx.windows.FULLSCREEN_NOSTATUSBAR
@@ -34,15 +34,15 @@ wxFULLSCREEN_ALL = wx.windows.FULLSCREEN_ALL
 wxTOPLEVEL_EX_DIALOG = wx.windows.TOPLEVEL_EX_DIALOG
 wxTopLevelWindow = wx.windows.TopLevelWindow
 wxTopLevelWindowPtr = wx.windows.TopLevelWindowPtr
-wxPreFrame = wx.windows.PreFrame
 wxFrame = wx.windows.Frame
 wxFramePtr = wx.windows.FramePtr
-wxPreDialog = wx.windows.PreDialog
+wxPreFrame = wx.windows.PreFrame
 wxDialog = wx.windows.Dialog
 wxDialogPtr = wx.windows.DialogPtr
-wxPreMiniFrame = wx.windows.PreMiniFrame
+wxPreDialog = wx.windows.PreDialog
 wxMiniFrame = wx.windows.MiniFrame
 wxMiniFramePtr = wx.windows.MiniFramePtr
+wxPreMiniFrame = wx.windows.PreMiniFrame
 wxSPLASH_CENTRE_ON_PARENT = wx.windows.SPLASH_CENTRE_ON_PARENT
 wxSPLASH_CENTRE_ON_SCREEN = wx.windows.SPLASH_CENTRE_ON_SCREEN
 wxSPLASH_NO_CENTRE = wx.windows.SPLASH_NO_CENTRE
@@ -52,9 +52,9 @@ wxSplashScreenWindow = wx.windows.SplashScreenWindow
 wxSplashScreenWindowPtr = wx.windows.SplashScreenWindowPtr
 wxSplashScreen = wx.windows.SplashScreen
 wxSplashScreenPtr = wx.windows.SplashScreenPtr
-wxPreStatusBar = wx.windows.PreStatusBar
 wxStatusBar = wx.windows.StatusBar
 wxStatusBarPtr = wx.windows.StatusBarPtr
+wxPreStatusBar = wx.windows.PreStatusBar
 wxSP_NOBORDER = wx.windows.SP_NOBORDER
 wxSP_NOSASH = wx.windows.SP_NOSASH
 wxSP_PERMIT_UNSPLIT = wx.windows.SP_PERMIT_UNSPLIT
@@ -68,9 +68,9 @@ wxSPLIT_VERTICAL = wx.windows.SPLIT_VERTICAL
 wxSPLIT_DRAG_NONE = wx.windows.SPLIT_DRAG_NONE
 wxSPLIT_DRAG_DRAGGING = wx.windows.SPLIT_DRAG_DRAGGING
 wxSPLIT_DRAG_LEFT_DOWN = wx.windows.SPLIT_DRAG_LEFT_DOWN
-wxPreSplitterWindow = wx.windows.PreSplitterWindow
 wxSplitterWindow = wx.windows.SplitterWindow
 wxSplitterWindowPtr = wx.windows.SplitterWindowPtr
+wxPreSplitterWindow = wx.windows.PreSplitterWindow
 wxSplitterEvent = wx.windows.SplitterEvent
 wxSplitterEventPtr = wx.windows.SplitterEventPtr
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wx.windows.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
@@ -90,9 +90,9 @@ wxSASH_RIGHT = wx.windows.SASH_RIGHT
 wxSASH_BOTTOM = wx.windows.SASH_BOTTOM
 wxSASH_LEFT = wx.windows.SASH_LEFT
 wxSASH_NONE = wx.windows.SASH_NONE
-wxPreSashWindow = wx.windows.PreSashWindow
 wxSashWindow = wx.windows.SashWindow
 wxSashWindowPtr = wx.windows.SashWindowPtr
+wxPreSashWindow = wx.windows.PreSashWindow
 wxSASH_STATUS_OK = wx.windows.SASH_STATUS_OK
 wxSASH_STATUS_OUT_OF_RANGE = wx.windows.SASH_STATUS_OUT_OF_RANGE
 wxSashEvent = wx.windows.SashEvent
@@ -115,28 +115,28 @@ wxQueryLayoutInfoEvent = wx.windows.QueryLayoutInfoEvent
 wxQueryLayoutInfoEventPtr = wx.windows.QueryLayoutInfoEventPtr
 wxCalculateLayoutEvent = wx.windows.CalculateLayoutEvent
 wxCalculateLayoutEventPtr = wx.windows.CalculateLayoutEventPtr
-wxPreSashLayoutWindow = wx.windows.PreSashLayoutWindow
 wxSashLayoutWindow = wx.windows.SashLayoutWindow
 wxSashLayoutWindowPtr = wx.windows.SashLayoutWindowPtr
+wxPreSashLayoutWindow = wx.windows.PreSashLayoutWindow
 wxLayoutAlgorithm = wx.windows.LayoutAlgorithm
 wxLayoutAlgorithmPtr = wx.windows.LayoutAlgorithmPtr
-wxPrePopupWindow = wx.windows.PrePopupWindow
 wxPopupWindow = wx.windows.PopupWindow
 wxPopupWindowPtr = wx.windows.PopupWindowPtr
-wxPrePopupTransientWindow = wx.windows.PrePopupTransientWindow
+wxPrePopupWindow = wx.windows.PrePopupWindow
 wxPopupTransientWindow = wx.windows.PopupTransientWindow
 wxPopupTransientWindowPtr = wx.windows.PopupTransientWindowPtr
+wxPrePopupTransientWindow = wx.windows.PrePopupTransientWindow
 wxTipWindow = wx.windows.TipWindow
 wxTipWindowPtr = wx.windows.TipWindowPtr
-wxPreVScrolledWindow = wx.windows.PreVScrolledWindow
 wxVScrolledWindow = wx.windows.VScrolledWindow
 wxVScrolledWindowPtr = wx.windows.VScrolledWindowPtr
-wxPreVListBox = wx.windows.PreVListBox
+wxPreVScrolledWindow = wx.windows.PreVScrolledWindow
 wxVListBox = wx.windows.VListBox
 wxVListBoxPtr = wx.windows.VListBoxPtr
-wxPreHtmlListBox = wx.windows.PreHtmlListBox
+wxPreVListBox = wx.windows.PreVListBox
 wxHtmlListBox = wx.windows.HtmlListBox
 wxHtmlListBoxPtr = wx.windows.HtmlListBoxPtr
+wxPreHtmlListBox = wx.windows.PreHtmlListBox
 wxTaskBarIcon = wx.windows.TaskBarIcon
 wxTaskBarIconPtr = wx.windows.TaskBarIconPtr
 wxTaskBarIconEvent = wx.windows.TaskBarIconEvent
@@ -187,9 +187,9 @@ wxFindDialogEvent = wx.windows.FindDialogEvent
 wxFindDialogEventPtr = wx.windows.FindDialogEventPtr
 wxFindReplaceData = wx.windows.FindReplaceData
 wxFindReplaceDataPtr = wx.windows.FindReplaceDataPtr
-wxPreFindReplaceDialog = wx.windows.PreFindReplaceDialog
 wxFindReplaceDialog = wx.windows.FindReplaceDialog
 wxFindReplaceDialogPtr = wx.windows.FindReplaceDialogPtr
+wxPreFindReplaceDialog = wx.windows.PreFindReplaceDialog
 IDM_WINDOWTILE = wx.windows.IDM_WINDOWTILE
 IDM_WINDOWTILEHOR = wx.windows.IDM_WINDOWTILEHOR
 IDM_WINDOWCASCADE = wx.windows.IDM_WINDOWCASCADE
@@ -198,15 +198,15 @@ IDM_WINDOWNEXT = wx.windows.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = wx.windows.IDM_WINDOWTILEVERT
 wxFIRST_MDI_CHILD = wx.windows.FIRST_MDI_CHILD
 wxLAST_MDI_CHILD = wx.windows.LAST_MDI_CHILD
-wxPreMDIParentFrame = wx.windows.PreMDIParentFrame
 wxMDIParentFrame = wx.windows.MDIParentFrame
 wxMDIParentFramePtr = wx.windows.MDIParentFramePtr
-wxPreMDIChildFrame = wx.windows.PreMDIChildFrame
+wxPreMDIParentFrame = wx.windows.PreMDIParentFrame
 wxMDIChildFrame = wx.windows.MDIChildFrame
 wxMDIChildFramePtr = wx.windows.MDIChildFramePtr
-wxPreMDIClientWindow = wx.windows.PreMDIClientWindow
+wxPreMDIChildFrame = wx.windows.PreMDIChildFrame
 wxMDIClientWindow = wx.windows.MDIClientWindow
 wxMDIClientWindowPtr = wx.windows.MDIClientWindowPtr
+wxPreMDIClientWindow = wx.windows.PreMDIClientWindow
 wxPyWindow = wx.windows.PyWindow
 wxPyWindowPtr = wx.windows.PyWindowPtr
 wxPyPanel = wx.windows.PyPanel
@@ -228,9 +228,9 @@ wxPrintDialogPtr = wx.windows.PrintDialogPtr
 wxPRINTER_NO_ERROR = wx.windows.PRINTER_NO_ERROR
 wxPRINTER_CANCELLED = wx.windows.PRINTER_CANCELLED
 wxPRINTER_ERROR = wx.windows.PRINTER_ERROR
-wxPrinter_GetLastError = wx.windows.Printer_GetLastError
 wxPrinter = wx.windows.Printer
 wxPrinterPtr = wx.windows.PrinterPtr
+wxPrinter_GetLastError = wx.windows.Printer_GetLastError
 wxPrintout = wx.windows.Printout
 wxPrintoutPtr = wx.windows.PrintoutPtr
 wxPreviewCanvas = wx.windows.PreviewCanvas

diff --git a/wxPython/wxPython/wizard.py b/wxPython/wxPython/wizard.py
index c032bbfe1aa13b0c6d989bfc5a1bc4eb4a0b8109..cd7625e2dbf59c2f66d662a151095c386e2a164b 100644 (file)
--- a/wxPython/wxPython/wizard.py
+++ b/wxPython/wxPython/wizard.py
@@ -29,16 +29,16 @@ wxWizardEvent = wx.wizard.WizardEvent
 wxWizardEventPtr = wx.wizard.WizardEventPtr
 wxWizardPage = wx.wizard.WizardPage
 wxWizardPagePtr = wx.wizard.WizardPagePtr
-wxPrePyWizardPage = wx.wizard.PrePyWizardPage
 wxPyWizardPage = wx.wizard.PyWizardPage
 wxPyWizardPagePtr = wx.wizard.PyWizardPagePtr
-wxPreWizardPageSimple = wx.wizard.PreWizardPageSimple
-wxWizardPageSimple_Chain = wx.wizard.WizardPageSimple_Chain
+wxPrePyWizardPage = wx.wizard.PrePyWizardPage
 wxWizardPageSimple = wx.wizard.WizardPageSimple
 wxWizardPageSimplePtr = wx.wizard.WizardPageSimplePtr
-wxPreWizard = wx.wizard.PreWizard
+wxPreWizardPageSimple = wx.wizard.PreWizardPageSimple
+wxWizardPageSimple_Chain = wx.wizard.WizardPageSimple_Chain
 wxWizard = wx.wizard.Wizard
 wxWizardPtr = wx.wizard.WizardPtr
+wxPreWizard = wx.wizard.PreWizard
 
 
 d = globals()

diff --git a/wxPython/wxPython/xrc.py b/wxPython/wxPython/xrc.py
index 6857ac0f3dad8d99c24983025bf496ff591a42e4..50fc1b33bba19d4ed8c7cbb1eb403c50f4dd76ad 100644 (file)
--- a/wxPython/wxPython/xrc.py
+++ b/wxPython/wxPython/xrc.py
@@ -25,13 +25,13 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = wx.xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
 WX_XMLRES_CURRENT_VERSION_REVISION = wx.xrc.WX_XMLRES_CURRENT_VERSION_REVISION
 wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE
 wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING
+wxXmlResource = wx.xrc.XmlResource
+wxXmlResourcePtr = wx.xrc.XmlResourcePtr
 wxEmptyXmlResource = wx.xrc.EmptyXmlResource
 wxXmlResource_AddSubclassFactory = wx.xrc.XmlResource_AddSubclassFactory
 wxXmlResource_GetXRCID = wx.xrc.XmlResource_GetXRCID
 wxXmlResource_Get = wx.xrc.XmlResource_Get
 wxXmlResource_Set = wx.xrc.XmlResource_Set
-wxXmlResource = wx.xrc.XmlResource
-wxXmlResourcePtr = wx.xrc.XmlResourcePtr
 wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory
 wxXmlSubclassFactoryPtr = wx.xrc.XmlSubclassFactoryPtr
 wxXML_ELEMENT_NODE = wx.xrc.XML_ELEMENT_NODE
@@ -49,13 +49,13 @@ wxXML_NOTATION_NODE = wx.xrc.XML_NOTATION_NODE
 wxXML_HTML_DOCUMENT_NODE = wx.xrc.XML_HTML_DOCUMENT_NODE
 wxXmlProperty = wx.xrc.XmlProperty
 wxXmlPropertyPtr = wx.xrc.XmlPropertyPtr
-wxXmlNodeEasy = wx.xrc.XmlNodeEasy
 wxXmlNode = wx.xrc.XmlNode
 wxXmlNodePtr = wx.xrc.XmlNodePtr
-wxXmlDocumentFromStream = wx.xrc.XmlDocumentFromStream
-wxEmptyXmlDocument = wx.xrc.EmptyXmlDocument
+wxXmlNodeEasy = wx.xrc.XmlNodeEasy
 wxXmlDocument = wx.xrc.XmlDocument
 wxXmlDocumentPtr = wx.xrc.XmlDocumentPtr
+wxXmlDocumentFromStream = wx.xrc.XmlDocumentFromStream
+wxEmptyXmlDocument = wx.xrc.EmptyXmlDocument
 wxXmlResourceHandler = wx.xrc.XmlResourceHandler
 wxXmlResourceHandlerPtr = wx.xrc.XmlResourceHandlerPtr
 XRCID   = wx.xrc.XRCID