Changed CanApplyParentThemeBackground to ApplyParentThemeBackground

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

diff --git a/wxPython/wxPython/controls.py b/wxPython/wxPython/controls.py
index 0f97fbd9ce95ae5a801389d7dc711a1110220709..a19560a8155d72332817c8fc21ef9121d0fe9e4e 100644 (file)
--- a/wxPython/wxPython/controls.py
+++ b/wxPython/wxPython/controls.py
@@ -19,60 +19,70 @@ del sys, _wx
 
 
 # Now assign all the reverse-renamed names:
 
 
 # Now assign all the reverse-renamed names:

+wxButtonNameStr = wx.controls.ButtonNameStr

 wxBU_LEFT = wx.controls.BU_LEFT
 wxBU_TOP = wx.controls.BU_TOP
 wxBU_RIGHT = wx.controls.BU_RIGHT
 wxBU_BOTTOM = wx.controls.BU_BOTTOM
 wxBU_EXACTFIT = wx.controls.BU_EXACTFIT
 wxBU_AUTODRAW = wx.controls.BU_AUTODRAW
 wxBU_LEFT = wx.controls.BU_LEFT
 wxBU_TOP = wx.controls.BU_TOP
 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
 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
 wxBitmapButton = wx.controls.BitmapButton
 wxBitmapButtonPtr = wx.controls.BitmapButtonPtr

+wxPreBitmapButton = wx.controls.PreBitmapButton
+wxCheckBoxNameStr = wx.controls.CheckBoxNameStr

 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
 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
 wxCheckBox = wx.controls.CheckBox
 wxCheckBoxPtr = wx.controls.CheckBoxPtr

-wxPreChoice = wx.controls.PreChoice
+wxPreCheckBox = wx.controls.PreCheckBox
+wxChoiceNameStr = wx.controls.ChoiceNameStr

 wxChoice = wx.controls.Choice
 wxChoicePtr = wx.controls.ChoicePtr
 wxChoice = wx.controls.Choice
 wxChoicePtr = wx.controls.ChoicePtr

-wxPreComboBox = wx.controls.PreComboBox
+wxPreChoice = wx.controls.PreChoice
+wxComboBoxNameStr = wx.controls.ComboBoxNameStr

 wxComboBox = wx.controls.ComboBox
 wxComboBoxPtr = wx.controls.ComboBoxPtr
 wxComboBox = wx.controls.ComboBox
 wxComboBoxPtr = wx.controls.ComboBoxPtr

+wxPreComboBox = wx.controls.PreComboBox
+wxGaugeNameStr = wx.controls.GaugeNameStr

 wxGA_HORIZONTAL = wx.controls.GA_HORIZONTAL
 wxGA_VERTICAL = wx.controls.GA_VERTICAL
 wxGA_SMOOTH = wx.controls.GA_SMOOTH
 wxGA_PROGRESSBAR = wx.controls.GA_PROGRESSBAR
 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
 wxGauge = wx.controls.Gauge
 wxGaugePtr = wx.controls.GaugePtr

-wxPreStaticBox = wx.controls.PreStaticBox
+wxPreGauge = wx.controls.PreGauge
+wxStaticBitmapNameStr = wx.controls.StaticBitmapNameStr
+wxStaticBoxNameStr = wx.controls.StaticBoxNameStr
+wxStaticTextNameStr = wx.controls.StaticTextNameStr

 wxStaticBox = wx.controls.StaticBox
 wxStaticBoxPtr = wx.controls.StaticBoxPtr
 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
 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
 wxStaticText = wx.controls.StaticText
 wxStaticTextPtr = wx.controls.StaticTextPtr

-wxPreStaticBitmap = wx.controls.PreStaticBitmap
+wxPreStaticText = wx.controls.PreStaticText

 wxStaticBitmap = wx.controls.StaticBitmap
 wxStaticBitmapPtr = wx.controls.StaticBitmapPtr
 wxStaticBitmap = wx.controls.StaticBitmap
 wxStaticBitmapPtr = wx.controls.StaticBitmapPtr

-wxPreListBox = wx.controls.PreListBox
+wxPreStaticBitmap = wx.controls.PreStaticBitmap
+wxListBoxNameStr = wx.controls.ListBoxNameStr

 wxListBox = wx.controls.ListBox
 wxListBoxPtr = wx.controls.ListBoxPtr
 wxListBox = wx.controls.ListBox
 wxListBoxPtr = wx.controls.ListBoxPtr

-wxPreCheckListBox = wx.controls.PreCheckListBox
+wxPreListBox = wx.controls.PreListBox

 wxCheckListBox = wx.controls.CheckListBox
 wxCheckListBoxPtr = wx.controls.CheckListBoxPtr
 wxCheckListBox = wx.controls.CheckListBox
 wxCheckListBoxPtr = wx.controls.CheckListBoxPtr

+wxPreCheckListBox = wx.controls.PreCheckListBox
+wxTextCtrlNameStr = wx.controls.TextCtrlNameStr

 wxTE_NO_VSCROLL = wx.controls.TE_NO_VSCROLL
 wxTE_AUTO_SCROLL = wx.controls.TE_AUTO_SCROLL
 wxTE_READONLY = wx.controls.TE_READONLY
 wxTE_NO_VSCROLL = wx.controls.TE_NO_VSCROLL
 wxTE_AUTO_SCROLL = wx.controls.TE_AUTO_SCROLL
 wxTE_READONLY = wx.controls.TE_READONLY


@@ -109,45 +119,60 @@ 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
 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
+wxTE_HT_UNKNOWN = wx.controls.TE_HT_UNKNOWN
+wxTE_HT_BEFORE = wx.controls.TE_HT_BEFORE
+wxTE_HT_ON_TEXT = wx.controls.TE_HT_ON_TEXT
+wxTE_HT_BELOW = wx.controls.TE_HT_BELOW
+wxTE_HT_BEYOND = wx.controls.TE_HT_BEYOND

 wxTextAttr = wx.controls.TextAttr
 wxTextAttrPtr = wx.controls.TextAttrPtr
 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
 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
 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
+wxScrollBarNameStr = wx.controls.ScrollBarNameStr

 wxScrollBar = wx.controls.ScrollBar
 wxScrollBarPtr = wx.controls.ScrollBarPtr
 wxScrollBar = wx.controls.ScrollBar
 wxScrollBarPtr = wx.controls.ScrollBarPtr

+wxPreScrollBar = wx.controls.PreScrollBar
+wxSPIN_BUTTON_NAME = wx.controls.SPIN_BUTTON_NAME
+wxSpinCtrlNameStr = wx.controls.SpinCtrlNameStr

 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
 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
 wxSpinButton = wx.controls.SpinButton
 wxSpinButtonPtr = wx.controls.SpinButtonPtr

-wxPreSpinCtrl = wx.controls.PreSpinCtrl
+wxPreSpinButton = wx.controls.PreSpinButton

 wxSpinCtrl = wx.controls.SpinCtrl
 wxSpinCtrlPtr = wx.controls.SpinCtrlPtr
 wxSpinCtrl = wx.controls.SpinCtrl
 wxSpinCtrlPtr = wx.controls.SpinCtrlPtr

+wxPreSpinCtrl = wx.controls.PreSpinCtrl
+wxSpinEvent = wx.controls.SpinEvent
+wxSpinEventPtr = wx.controls.SpinEventPtr

 wxEVT_COMMAND_SPINCTRL_UPDATED = wx.controls.wxEVT_COMMAND_SPINCTRL_UPDATED
 wxEVT_COMMAND_SPINCTRL_UPDATED = wx.controls.wxEVT_COMMAND_SPINCTRL_UPDATED

-wxPreRadioBox = wx.controls.PreRadioBox
+wxRadioBoxNameStr = wx.controls.RadioBoxNameStr
+wxRadioButtonNameStr = wx.controls.RadioButtonNameStr

 wxRadioBox = wx.controls.RadioBox
 wxRadioBoxPtr = wx.controls.RadioBoxPtr
 wxRadioBox = wx.controls.RadioBox
 wxRadioBoxPtr = wx.controls.RadioBoxPtr

-wxPreRadioButton = wx.controls.PreRadioButton
+wxPreRadioBox = wx.controls.PreRadioBox

 wxRadioButton = wx.controls.RadioButton
 wxRadioButtonPtr = wx.controls.RadioButtonPtr
 wxRadioButton = wx.controls.RadioButton
 wxRadioButtonPtr = wx.controls.RadioButtonPtr

-wxPreSlider = wx.controls.PreSlider
+wxPreRadioButton = wx.controls.PreRadioButton
+wxSliderNameStr = wx.controls.SliderNameStr

 wxSlider = wx.controls.Slider
 wxSliderPtr = wx.controls.SliderPtr
 wxSlider = wx.controls.Slider
 wxSliderPtr = wx.controls.SliderPtr

+wxPreSlider = wx.controls.PreSlider
+wxToggleButtonNameStr = wx.controls.ToggleButtonNameStr

 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx.controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx.controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED

-wxPreToggleButton = wx.controls.PreToggleButton

 wxToggleButton = wx.controls.ToggleButton
 wxToggleButtonPtr = wx.controls.ToggleButtonPtr
 wxToggleButton = wx.controls.ToggleButton
 wxToggleButtonPtr = wx.controls.ToggleButtonPtr

+wxPreToggleButton = wx.controls.PreToggleButton
+wxNOTEBOOK_NAME = wx.controls.NOTEBOOK_NAME

 wxBookCtrl = wx.controls.BookCtrl
 wxBookCtrlPtr = wx.controls.BookCtrlPtr
 wxBookCtrlEvent = wx.controls.BookCtrlEvent
 wxBookCtrl = wx.controls.BookCtrl
 wxBookCtrlPtr = wx.controls.BookCtrlPtr
 wxBookCtrlEvent = wx.controls.BookCtrlEvent


@@ -162,9 +187,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
 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
 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
 wxNotebookEvent = wx.controls.NotebookEvent
 wxNotebookEventPtr = wx.controls.NotebookEventPtr
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wx.controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED


@@ -175,9 +200,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
 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
 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
 wxListbookEvent = wx.controls.ListbookEvent
 wxListbookEventPtr = wx.controls.ListbookEventPtr
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx.controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED


@@ -204,9 +229,10 @@ wxToolBarToolBase = wx.controls.ToolBarToolBase
 wxToolBarToolBasePtr = wx.controls.ToolBarToolBasePtr
 wxToolBarBase = wx.controls.ToolBarBase
 wxToolBarBasePtr = wx.controls.ToolBarBasePtr
 wxToolBarToolBasePtr = wx.controls.ToolBarToolBasePtr
 wxToolBarBase = wx.controls.ToolBarBase
 wxToolBarBasePtr = wx.controls.ToolBarBasePtr

-wxPreToolBar = wx.controls.PreToolBar

 wxToolBar = wx.controls.ToolBar
 wxToolBarPtr = wx.controls.ToolBarPtr
 wxToolBar = wx.controls.ToolBar
 wxToolBarPtr = wx.controls.ToolBarPtr

+wxPreToolBar = wx.controls.PreToolBar
+wxListCtrlNameStr = wx.controls.ListCtrlNameStr

 wxLC_VRULES = wx.controls.LC_VRULES
 wxLC_HRULES = wx.controls.LC_HRULES
 wxLC_ICON = wx.controls.LC_ICON
 wxLC_VRULES = wx.controls.LC_VRULES
 wxLC_HRULES = wx.controls.LC_HRULES
 wxLC_ICON = wx.controls.LC_ICON


@@ -303,12 +329,13 @@ 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
 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
 wxListCtrl = wx.controls.ListCtrl
 wxListCtrlPtr = wx.controls.ListCtrlPtr

-wxPreListView = wx.controls.PreListView
+wxPreListCtrl = wx.controls.PreListCtrl

 wxListView = wx.controls.ListView
 wxListViewPtr = wx.controls.ListViewPtr
 wxListView = wx.controls.ListView
 wxListViewPtr = wx.controls.ListViewPtr

+wxPreListView = wx.controls.PreListView
+wxTreeCtrlNameStr = wx.controls.TreeCtrlNameStr

 wxTR_NO_BUTTONS = wx.controls.TR_NO_BUTTONS
 wxTR_HAS_BUTTONS = wx.controls.TR_HAS_BUTTONS
 wxTR_NO_LINES = wx.controls.TR_NO_LINES
 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 +394,24 @@ 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_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
 wxTreeEvent = wx.controls.TreeEvent
 wxTreeEventPtr = wx.controls.TreeEventPtr

-wxPreTreeCtrl = wx.controls.PreTreeCtrl

 wxTreeCtrl = wx.controls.TreeCtrl
 wxTreeCtrlPtr = wx.controls.TreeCtrlPtr
 wxTreeCtrl = wx.controls.TreeCtrl
 wxTreeCtrlPtr = wx.controls.TreeCtrlPtr

+wxPreTreeCtrl = wx.controls.PreTreeCtrl
+wxDirDialogDefaultFolderStr = wx.controls.DirDialogDefaultFolderStr

 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
 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
 wxGenericDirCtrl = wx.controls.GenericDirCtrl
 wxGenericDirCtrlPtr = wx.controls.GenericDirCtrlPtr

-wxPreDirFilterListCtrl = wx.controls.PreDirFilterListCtrl
+wxPreGenericDirCtrl = wx.controls.PreGenericDirCtrl

 wxDirFilterListCtrl = wx.controls.DirFilterListCtrl
 wxDirFilterListCtrlPtr = wx.controls.DirFilterListCtrlPtr
 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
 wxPyControl = wx.controls.PyControl
 wxPyControlPtr = wx.controls.PyControlPtr
 wxFRAME_EX_CONTEXTHELP = wx.controls.FRAME_EX_CONTEXTHELP


@@ -395,18 +424,18 @@ wxContextHelp = wx.controls.ContextHelp
 wxContextHelpPtr = wx.controls.ContextHelpPtr
 wxContextHelpButton = wx.controls.ContextHelpButton
 wxContextHelpButtonPtr = wx.controls.ContextHelpButtonPtr
 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 = 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
 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
 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()
 
 
 d = globals()