drop highlight color fix

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

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index 2f25cb9258308a333dd05dc1e4d848c50a7313b8..87773869bc11616772f24d69311ec341c376f6e2 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -24,15 +24,14 @@ 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_TOP = wx._controls.BU_TOP
 wxBU_RIGHT = wx._controls.BU_RIGHT
 wxBU_BOTTOM = wx._controls.BU_BOTTOM

+wxBU_ALIGN_MASK = wx._controls.BU_ALIGN_MASK

 wxBU_EXACTFIT = wx._controls.BU_EXACTFIT
 wxBU_AUTODRAW = wx._controls.BU_AUTODRAW
 wxButton = wx._controls.Button
 wxBU_EXACTFIT = wx._controls.BU_EXACTFIT
 wxBU_AUTODRAW = wx._controls.BU_AUTODRAW
 wxButton = wx._controls.Button

-wxButtonPtr = wx._controls.ButtonPtr

 wxPreButton = wx._controls.PreButton
 wxButton_GetDefaultSize = wx._controls.Button_GetDefaultSize
 wxButton_GetClassDefaultAttributes = wx._controls.Button_GetClassDefaultAttributes
 wxBitmapButton = wx._controls.BitmapButton
 wxPreButton = wx._controls.PreButton
 wxButton_GetDefaultSize = wx._controls.Button_GetDefaultSize
 wxButton_GetClassDefaultAttributes = wx._controls.Button_GetClassDefaultAttributes
 wxBitmapButton = wx._controls.BitmapButton

-wxBitmapButtonPtr = wx._controls.BitmapButtonPtr

 wxPreBitmapButton = wx._controls.PreBitmapButton
 wxCheckBoxNameStr = wx._controls.CheckBoxNameStr
 wxCHK_2STATE = wx._controls.CHK_2STATE
 wxPreBitmapButton = wx._controls.PreBitmapButton
 wxCheckBoxNameStr = wx._controls.CheckBoxNameStr
 wxCHK_2STATE = wx._controls.CHK_2STATE


@@ -42,55 +41,44 @@ wxCHK_UNCHECKED = wx._controls.CHK_UNCHECKED
 wxCHK_CHECKED = wx._controls.CHK_CHECKED
 wxCHK_UNDETERMINED = wx._controls.CHK_UNDETERMINED
 wxCheckBox = wx._controls.CheckBox
 wxCHK_CHECKED = wx._controls.CHK_CHECKED
 wxCHK_UNDETERMINED = wx._controls.CHK_UNDETERMINED
 wxCheckBox = wx._controls.CheckBox

-wxCheckBoxPtr = wx._controls.CheckBoxPtr

 wxPreCheckBox = wx._controls.PreCheckBox
 wxCheckBox_GetClassDefaultAttributes = wx._controls.CheckBox_GetClassDefaultAttributes
 wxChoiceNameStr = wx._controls.ChoiceNameStr
 wxChoice = wx._controls.Choice
 wxPreCheckBox = wx._controls.PreCheckBox
 wxCheckBox_GetClassDefaultAttributes = wx._controls.CheckBox_GetClassDefaultAttributes
 wxChoiceNameStr = wx._controls.ChoiceNameStr
 wxChoice = wx._controls.Choice

-wxChoicePtr = wx._controls.ChoicePtr

 wxPreChoice = wx._controls.PreChoice
 wxChoice_GetClassDefaultAttributes = wx._controls.Choice_GetClassDefaultAttributes
 wxComboBoxNameStr = wx._controls.ComboBoxNameStr
 wxComboBox = wx._controls.ComboBox
 wxPreChoice = wx._controls.PreChoice
 wxChoice_GetClassDefaultAttributes = wx._controls.Choice_GetClassDefaultAttributes
 wxComboBoxNameStr = wx._controls.ComboBoxNameStr
 wxComboBox = wx._controls.ComboBox

-wxComboBoxPtr = wx._controls.ComboBoxPtr

 wxPreComboBox = wx._controls.PreComboBox
 wxComboBox_GetClassDefaultAttributes = wx._controls.ComboBox_GetClassDefaultAttributes
 wxGaugeNameStr = wx._controls.GaugeNameStr
 wxGA_HORIZONTAL = wx._controls.GA_HORIZONTAL
 wxGA_VERTICAL = wx._controls.GA_VERTICAL
 wxGA_SMOOTH = wx._controls.GA_SMOOTH
 wxPreComboBox = wx._controls.PreComboBox
 wxComboBox_GetClassDefaultAttributes = wx._controls.ComboBox_GetClassDefaultAttributes
 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

 wxGauge = wx._controls.Gauge
 wxGauge = wx._controls.Gauge

-wxGaugePtr = wx._controls.GaugePtr

 wxPreGauge = wx._controls.PreGauge
 wxGauge_GetClassDefaultAttributes = wx._controls.Gauge_GetClassDefaultAttributes
 wxStaticBitmapNameStr = wx._controls.StaticBitmapNameStr
 wxStaticBoxNameStr = wx._controls.StaticBoxNameStr
 wxStaticTextNameStr = wx._controls.StaticTextNameStr
 wxStaticBox = wx._controls.StaticBox
 wxPreGauge = wx._controls.PreGauge
 wxGauge_GetClassDefaultAttributes = wx._controls.Gauge_GetClassDefaultAttributes
 wxStaticBitmapNameStr = wx._controls.StaticBitmapNameStr
 wxStaticBoxNameStr = wx._controls.StaticBoxNameStr
 wxStaticTextNameStr = wx._controls.StaticTextNameStr
 wxStaticBox = wx._controls.StaticBox

-wxStaticBoxPtr = wx._controls.StaticBoxPtr

 wxPreStaticBox = wx._controls.PreStaticBox
 wxStaticBox_GetClassDefaultAttributes = wx._controls.StaticBox_GetClassDefaultAttributes
 wxStaticLine = wx._controls.StaticLine
 wxPreStaticBox = wx._controls.PreStaticBox
 wxStaticBox_GetClassDefaultAttributes = wx._controls.StaticBox_GetClassDefaultAttributes
 wxStaticLine = wx._controls.StaticLine

-wxStaticLinePtr = wx._controls.StaticLinePtr

 wxPreStaticLine = wx._controls.PreStaticLine
 wxStaticLine_GetDefaultSize = wx._controls.StaticLine_GetDefaultSize
 wxStaticLine_GetClassDefaultAttributes = wx._controls.StaticLine_GetClassDefaultAttributes
 wxStaticText = wx._controls.StaticText
 wxPreStaticLine = wx._controls.PreStaticLine
 wxStaticLine_GetDefaultSize = wx._controls.StaticLine_GetDefaultSize
 wxStaticLine_GetClassDefaultAttributes = wx._controls.StaticLine_GetClassDefaultAttributes
 wxStaticText = wx._controls.StaticText

-wxStaticTextPtr = wx._controls.StaticTextPtr

 wxPreStaticText = wx._controls.PreStaticText
 wxStaticText_GetClassDefaultAttributes = wx._controls.StaticText_GetClassDefaultAttributes
 wxStaticBitmap = wx._controls.StaticBitmap
 wxPreStaticText = wx._controls.PreStaticText
 wxStaticText_GetClassDefaultAttributes = wx._controls.StaticText_GetClassDefaultAttributes
 wxStaticBitmap = wx._controls.StaticBitmap

-wxStaticBitmapPtr = wx._controls.StaticBitmapPtr

 wxPreStaticBitmap = wx._controls.PreStaticBitmap
 wxStaticBitmap_GetClassDefaultAttributes = wx._controls.StaticBitmap_GetClassDefaultAttributes
 wxListBoxNameStr = wx._controls.ListBoxNameStr
 wxListBox = wx._controls.ListBox
 wxPreStaticBitmap = wx._controls.PreStaticBitmap
 wxStaticBitmap_GetClassDefaultAttributes = wx._controls.StaticBitmap_GetClassDefaultAttributes
 wxListBoxNameStr = wx._controls.ListBoxNameStr
 wxListBox = wx._controls.ListBox

-wxListBoxPtr = wx._controls.ListBoxPtr

 wxPreListBox = wx._controls.PreListBox
 wxListBox_GetClassDefaultAttributes = wx._controls.ListBox_GetClassDefaultAttributes
 wxCheckListBox = wx._controls.CheckListBox
 wxPreListBox = wx._controls.PreListBox
 wxListBox_GetClassDefaultAttributes = wx._controls.ListBox_GetClassDefaultAttributes
 wxCheckListBox = wx._controls.CheckListBox

-wxCheckListBoxPtr = wx._controls.CheckListBoxPtr

 wxPreCheckListBox = wx._controls.PreCheckListBox
 wxTextCtrlNameStr = wx._controls.TextCtrlNameStr
 wxTE_NO_VSCROLL = wx._controls.TE_NO_VSCROLL
 wxPreCheckListBox = wx._controls.PreCheckListBox
 wxTextCtrlNameStr = wx._controls.TextCtrlNameStr
 wxTE_NO_VSCROLL = wx._controls.TE_NO_VSCROLL


@@ -108,9 +96,11 @@ wxTE_PASSWORD = wx._controls.TE_PASSWORD
 wxTE_AUTO_URL = wx._controls.TE_AUTO_URL
 wxTE_NOHIDESEL = wx._controls.TE_NOHIDESEL
 wxTE_DONTWRAP = wx._controls.TE_DONTWRAP
 wxTE_AUTO_URL = wx._controls.TE_AUTO_URL
 wxTE_NOHIDESEL = wx._controls.TE_NOHIDESEL
 wxTE_DONTWRAP = wx._controls.TE_DONTWRAP

-wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
+wxTE_CHARWRAP = wx._controls.TE_CHARWRAP

 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP
 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP

+wxTE_BESTWRAP = wx._controls.TE_BESTWRAP

 wxTE_RICH2 = wx._controls.TE_RICH2
 wxTE_RICH2 = wx._controls.TE_RICH2

+wxTE_CAPITALIZE = wx._controls.TE_CAPITALIZE

 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT
 wxTEXT_ALIGNMENT_LEFT = wx._controls.TEXT_ALIGNMENT_LEFT
 wxTEXT_ALIGNMENT_CENTRE = wx._controls.TEXT_ALIGNMENT_CENTRE
 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT
 wxTEXT_ALIGNMENT_LEFT = wx._controls.TEXT_ALIGNMENT_LEFT
 wxTEXT_ALIGNMENT_CENTRE = wx._controls.TEXT_ALIGNMENT_CENTRE


@@ -134,11 +124,12 @@ 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
 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

+wxOutOfRangeTextCoord = wx._controls.OutOfRangeTextCoord
+wxInvalidTextCoord = wx._controls.InvalidTextCoord

 wxTextAttr = wx._controls.TextAttr
 wxTextAttr = wx._controls.TextAttr

-wxTextAttrPtr = wx._controls.TextAttrPtr
+wxTextAttr_Merge = wx._controls.TextAttr_Merge

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

-wxTextCtrlPtr = wx._controls.TextCtrlPtr

 wxPreTextCtrl = wx._controls.PreTextCtrl
 wxTextCtrl_GetClassDefaultAttributes = wx._controls.TextCtrl_GetClassDefaultAttributes
 wxEVT_COMMAND_TEXT_UPDATED = wx._controls.wxEVT_COMMAND_TEXT_UPDATED
 wxPreTextCtrl = wx._controls.PreTextCtrl
 wxTextCtrl_GetClassDefaultAttributes = wx._controls.TextCtrl_GetClassDefaultAttributes
 wxEVT_COMMAND_TEXT_UPDATED = wx._controls.wxEVT_COMMAND_TEXT_UPDATED


@@ -146,10 +137,8 @@ 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
 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

 wxScrollBarNameStr = wx._controls.ScrollBarNameStr
 wxScrollBar = wx._controls.ScrollBar
 wxScrollBarNameStr = wx._controls.ScrollBarNameStr
 wxScrollBar = wx._controls.ScrollBar

-wxScrollBarPtr = wx._controls.ScrollBarPtr

 wxPreScrollBar = wx._controls.PreScrollBar
 wxScrollBar_GetClassDefaultAttributes = wx._controls.ScrollBar_GetClassDefaultAttributes
 wxSPIN_BUTTON_NAME = wx._controls.SPIN_BUTTON_NAME
 wxPreScrollBar = wx._controls.PreScrollBar
 wxScrollBar_GetClassDefaultAttributes = wx._controls.ScrollBar_GetClassDefaultAttributes
 wxSPIN_BUTTON_NAME = wx._controls.SPIN_BUTTON_NAME


@@ -159,59 +148,68 @@ wxSP_VERTICAL = wx._controls.SP_VERTICAL
 wxSP_ARROW_KEYS = wx._controls.SP_ARROW_KEYS
 wxSP_WRAP = wx._controls.SP_WRAP
 wxSpinButton = wx._controls.SpinButton
 wxSP_ARROW_KEYS = wx._controls.SP_ARROW_KEYS
 wxSP_WRAP = wx._controls.SP_WRAP
 wxSpinButton = wx._controls.SpinButton

-wxSpinButtonPtr = wx._controls.SpinButtonPtr

 wxPreSpinButton = wx._controls.PreSpinButton
 wxSpinButton_GetClassDefaultAttributes = wx._controls.SpinButton_GetClassDefaultAttributes
 wxSpinCtrl = wx._controls.SpinCtrl
 wxPreSpinButton = wx._controls.PreSpinButton
 wxSpinButton_GetClassDefaultAttributes = wx._controls.SpinButton_GetClassDefaultAttributes
 wxSpinCtrl = wx._controls.SpinCtrl

-wxSpinCtrlPtr = wx._controls.SpinCtrlPtr

 wxPreSpinCtrl = wx._controls.PreSpinCtrl
 wxSpinCtrl_GetClassDefaultAttributes = wx._controls.SpinCtrl_GetClassDefaultAttributes
 wxSpinEvent = wx._controls.SpinEvent
 wxPreSpinCtrl = wx._controls.PreSpinCtrl
 wxSpinCtrl_GetClassDefaultAttributes = wx._controls.SpinCtrl_GetClassDefaultAttributes
 wxSpinEvent = wx._controls.SpinEvent

-wxSpinEventPtr = wx._controls.SpinEventPtr

 wxEVT_COMMAND_SPINCTRL_UPDATED = wx._controls.wxEVT_COMMAND_SPINCTRL_UPDATED
 wxRadioBoxNameStr = wx._controls.RadioBoxNameStr
 wxRadioButtonNameStr = wx._controls.RadioButtonNameStr
 wxRadioBox = wx._controls.RadioBox
 wxEVT_COMMAND_SPINCTRL_UPDATED = wx._controls.wxEVT_COMMAND_SPINCTRL_UPDATED
 wxRadioBoxNameStr = wx._controls.RadioBoxNameStr
 wxRadioButtonNameStr = wx._controls.RadioButtonNameStr
 wxRadioBox = wx._controls.RadioBox

-wxRadioBoxPtr = wx._controls.RadioBoxPtr

 wxPreRadioBox = wx._controls.PreRadioBox
 wxRadioBox_GetClassDefaultAttributes = wx._controls.RadioBox_GetClassDefaultAttributes
 wxRadioButton = wx._controls.RadioButton
 wxPreRadioBox = wx._controls.PreRadioBox
 wxRadioBox_GetClassDefaultAttributes = wx._controls.RadioBox_GetClassDefaultAttributes
 wxRadioButton = wx._controls.RadioButton

-wxRadioButtonPtr = wx._controls.RadioButtonPtr

 wxPreRadioButton = wx._controls.PreRadioButton
 wxRadioButton_GetClassDefaultAttributes = wx._controls.RadioButton_GetClassDefaultAttributes
 wxSliderNameStr = wx._controls.SliderNameStr
 wxPreRadioButton = wx._controls.PreRadioButton
 wxRadioButton_GetClassDefaultAttributes = wx._controls.RadioButton_GetClassDefaultAttributes
 wxSliderNameStr = wx._controls.SliderNameStr

+wxSL_HORIZONTAL = wx._controls.SL_HORIZONTAL
+wxSL_VERTICAL = wx._controls.SL_VERTICAL
+wxSL_TICKS = wx._controls.SL_TICKS
+wxSL_AUTOTICKS = wx._controls.SL_AUTOTICKS
+wxSL_LABELS = wx._controls.SL_LABELS
+wxSL_LEFT = wx._controls.SL_LEFT
+wxSL_TOP = wx._controls.SL_TOP
+wxSL_RIGHT = wx._controls.SL_RIGHT
+wxSL_BOTTOM = wx._controls.SL_BOTTOM
+wxSL_BOTH = wx._controls.SL_BOTH
+wxSL_SELRANGE = wx._controls.SL_SELRANGE
+wxSL_INVERSE = wx._controls.SL_INVERSE

 wxSlider = wx._controls.Slider
 wxSlider = wx._controls.Slider

-wxSliderPtr = wx._controls.SliderPtr

 wxPreSlider = wx._controls.PreSlider
 wxSlider_GetClassDefaultAttributes = wx._controls.Slider_GetClassDefaultAttributes
 wxToggleButtonNameStr = wx._controls.ToggleButtonNameStr
 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx._controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
 wxToggleButton = wx._controls.ToggleButton
 wxPreSlider = wx._controls.PreSlider
 wxSlider_GetClassDefaultAttributes = wx._controls.Slider_GetClassDefaultAttributes
 wxToggleButtonNameStr = wx._controls.ToggleButtonNameStr
 wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wx._controls.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
 wxToggleButton = wx._controls.ToggleButton

-wxToggleButtonPtr = wx._controls.ToggleButtonPtr

 wxPreToggleButton = wx._controls.PreToggleButton
 wxToggleButton_GetClassDefaultAttributes = wx._controls.ToggleButton_GetClassDefaultAttributes
 wxPreToggleButton = wx._controls.PreToggleButton
 wxToggleButton_GetClassDefaultAttributes = wx._controls.ToggleButton_GetClassDefaultAttributes

-wxNOTEBOOK_NAME = wx._controls.NOTEBOOK_NAME
-wxBookCtrl = wx._controls.BookCtrl
-wxBookCtrlPtr = wx._controls.BookCtrlPtr
-wxBookCtrl_GetClassDefaultAttributes = wx._controls.BookCtrl_GetClassDefaultAttributes
-wxBookCtrlEvent = wx._controls.BookCtrlEvent
-wxBookCtrlEventPtr = wx._controls.BookCtrlEventPtr
+wxNotebookNameStr = wx._controls.NotebookNameStr
+wxBK_DEFAULT = wx._controls.BK_DEFAULT
+wxBK_TOP = wx._controls.BK_TOP
+wxBK_BOTTOM = wx._controls.BK_BOTTOM
+wxBK_LEFT = wx._controls.BK_LEFT
+wxBK_RIGHT = wx._controls.BK_RIGHT
+wxBK_ALIGN_MASK = wx._controls.BK_ALIGN_MASK
+wxBK_BUTTONBAR = wx._controls.BK_BUTTONBAR
+wxBookCtrlBase = wx._controls.BookCtrlBase
+wxBookCtrlBase_GetClassDefaultAttributes = wx._controls.BookCtrlBase_GetClassDefaultAttributes
+wxBookCtrlBaseEvent = wx._controls.BookCtrlBaseEvent

 wxNB_FIXEDWIDTH = wx._controls.NB_FIXEDWIDTH
 wxNB_TOP = wx._controls.NB_TOP
 wxNB_LEFT = wx._controls.NB_LEFT
 wxNB_RIGHT = wx._controls.NB_RIGHT
 wxNB_BOTTOM = wx._controls.NB_BOTTOM
 wxNB_MULTILINE = wx._controls.NB_MULTILINE
 wxNB_FIXEDWIDTH = wx._controls.NB_FIXEDWIDTH
 wxNB_TOP = wx._controls.NB_TOP
 wxNB_LEFT = wx._controls.NB_LEFT
 wxNB_RIGHT = wx._controls.NB_RIGHT
 wxNB_BOTTOM = wx._controls.NB_BOTTOM
 wxNB_MULTILINE = wx._controls.NB_MULTILINE

+wxNB_NOPAGETHEME = wx._controls.NB_NOPAGETHEME

 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
 wxNotebook = wx._controls.Notebook
 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
 wxNotebook = wx._controls.Notebook

-wxNotebookPtr = wx._controls.NotebookPtr

 wxPreNotebook = wx._controls.PreNotebook
 wxNotebook_GetClassDefaultAttributes = wx._controls.Notebook_GetClassDefaultAttributes
 wxNotebookEvent = wx._controls.NotebookEvent
 wxPreNotebook = wx._controls.PreNotebook
 wxNotebook_GetClassDefaultAttributes = wx._controls.Notebook_GetClassDefaultAttributes
 wxNotebookEvent = wx._controls.NotebookEvent

-wxNotebookEventPtr = wx._controls.NotebookEventPtr

 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
 wxLB_DEFAULT = wx._controls.LB_DEFAULT
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
 wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
 wxLB_DEFAULT = wx._controls.LB_DEFAULT


@@ -221,16 +219,33 @@ wxLB_LEFT = wx._controls.LB_LEFT
 wxLB_RIGHT = wx._controls.LB_RIGHT
 wxLB_ALIGN_MASK = wx._controls.LB_ALIGN_MASK
 wxListbook = wx._controls.Listbook
 wxLB_RIGHT = wx._controls.LB_RIGHT
 wxLB_ALIGN_MASK = wx._controls.LB_ALIGN_MASK
 wxListbook = wx._controls.Listbook

-wxListbookPtr = wx._controls.ListbookPtr

 wxPreListbook = wx._controls.PreListbook
 wxListbookEvent = wx._controls.ListbookEvent
 wxPreListbook = wx._controls.PreListbook
 wxListbookEvent = wx._controls.ListbookEvent

-wxListbookEventPtr = wx._controls.ListbookEventPtr

 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
 wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING

-wxBookCtrlSizer = wx._controls.BookCtrlSizer
-wxBookCtrlSizerPtr = wx._controls.BookCtrlSizerPtr
-wxNotebookSizer = wx._controls.NotebookSizer
-wxNotebookSizerPtr = wx._controls.NotebookSizerPtr
+wxCHB_DEFAULT = wx._controls.CHB_DEFAULT
+wxCHB_TOP = wx._controls.CHB_TOP
+wxCHB_BOTTOM = wx._controls.CHB_BOTTOM
+wxCHB_LEFT = wx._controls.CHB_LEFT
+wxCHB_RIGHT = wx._controls.CHB_RIGHT
+wxCHB_ALIGN_MASK = wx._controls.CHB_ALIGN_MASK
+wxChoicebook = wx._controls.Choicebook
+wxPreChoicebook = wx._controls.PreChoicebook
+wxChoicebookEvent = wx._controls.ChoicebookEvent
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED
+wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING
+wxTreebook = wx._controls.Treebook
+wxPreTreebook = wx._controls.PreTreebook
+wxTreebookEvent = wx._controls.TreebookEvent
+wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED
+wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING
+wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = wx._controls.wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED
+wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = wx._controls.wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED
+wxToolbook = wx._controls.Toolbook
+wxPreToolbook = wx._controls.PreToolbook
+wxToolbookEvent = wx._controls.ToolbookEvent
+wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wx._controls.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED
+wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wx._controls.wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING

 wxTOOL_STYLE_BUTTON = wx._controls.TOOL_STYLE_BUTTON
 wxTOOL_STYLE_SEPARATOR = wx._controls.TOOL_STYLE_SEPARATOR
 wxTOOL_STYLE_CONTROL = wx._controls.TOOL_STYLE_CONTROL
 wxTOOL_STYLE_BUTTON = wx._controls.TOOL_STYLE_BUTTON
 wxTOOL_STYLE_SEPARATOR = wx._controls.TOOL_STYLE_SEPARATOR
 wxTOOL_STYLE_CONTROL = wx._controls.TOOL_STYLE_CONTROL


@@ -246,11 +261,8 @@ wxTB_NOALIGN = wx._controls.TB_NOALIGN
 wxTB_HORZ_LAYOUT = wx._controls.TB_HORZ_LAYOUT
 wxTB_HORZ_TEXT = wx._controls.TB_HORZ_TEXT
 wxToolBarToolBase = wx._controls.ToolBarToolBase
 wxTB_HORZ_LAYOUT = wx._controls.TB_HORZ_LAYOUT
 wxTB_HORZ_TEXT = wx._controls.TB_HORZ_TEXT
 wxToolBarToolBase = wx._controls.ToolBarToolBase

-wxToolBarToolBasePtr = wx._controls.ToolBarToolBasePtr

 wxToolBarBase = wx._controls.ToolBarBase
 wxToolBarBase = wx._controls.ToolBarBase

-wxToolBarBasePtr = wx._controls.ToolBarBasePtr

 wxToolBar = wx._controls.ToolBar
 wxToolBar = wx._controls.ToolBar

-wxToolBarPtr = wx._controls.ToolBarPtr

 wxPreToolBar = wx._controls.PreToolBar
 wxToolBar_GetClassDefaultAttributes = wx._controls.ToolBar_GetClassDefaultAttributes
 wxListCtrlNameStr = wx._controls.ListCtrlNameStr
 wxPreToolBar = wx._controls.PreToolBar
 wxToolBar_GetClassDefaultAttributes = wx._controls.ToolBar_GetClassDefaultAttributes
 wxListCtrlNameStr = wx._controls.ListCtrlNameStr


@@ -323,19 +335,14 @@ wxLIST_FIND_DOWN = wx._controls.LIST_FIND_DOWN
 wxLIST_FIND_LEFT = wx._controls.LIST_FIND_LEFT
 wxLIST_FIND_RIGHT = wx._controls.LIST_FIND_RIGHT
 wxListItemAttr = wx._controls.ListItemAttr
 wxLIST_FIND_LEFT = wx._controls.LIST_FIND_LEFT
 wxLIST_FIND_RIGHT = wx._controls.LIST_FIND_RIGHT
 wxListItemAttr = wx._controls.ListItemAttr

-wxListItemAttrPtr = wx._controls.ListItemAttrPtr

 wxListItem = wx._controls.ListItem
 wxListItem = wx._controls.ListItem

-wxListItemPtr = wx._controls.ListItemPtr

 wxListEvent = wx._controls.ListEvent
 wxListEvent = wx._controls.ListEvent

-wxListEventPtr = wx._controls.ListEventPtr

 wxEVT_COMMAND_LIST_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_DRAG
 wxEVT_COMMAND_LIST_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_RDRAG
 wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wx._controls.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
 wxEVT_COMMAND_LIST_END_LABEL_EDIT = wx._controls.wxEVT_COMMAND_LIST_END_LABEL_EDIT
 wxEVT_COMMAND_LIST_DELETE_ITEM = wx._controls.wxEVT_COMMAND_LIST_DELETE_ITEM
 wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wx._controls.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS
 wxEVT_COMMAND_LIST_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_DRAG
 wxEVT_COMMAND_LIST_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_LIST_BEGIN_RDRAG
 wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wx._controls.wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT
 wxEVT_COMMAND_LIST_END_LABEL_EDIT = wx._controls.wxEVT_COMMAND_LIST_END_LABEL_EDIT
 wxEVT_COMMAND_LIST_DELETE_ITEM = wx._controls.wxEVT_COMMAND_LIST_DELETE_ITEM
 wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wx._controls.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS

-wxEVT_COMMAND_LIST_GET_INFO = wx._controls.wxEVT_COMMAND_LIST_GET_INFO
-wxEVT_COMMAND_LIST_SET_INFO = wx._controls.wxEVT_COMMAND_LIST_SET_INFO

 wxEVT_COMMAND_LIST_ITEM_SELECTED = wx._controls.wxEVT_COMMAND_LIST_ITEM_SELECTED
 wxEVT_COMMAND_LIST_ITEM_DESELECTED = wx._controls.wxEVT_COMMAND_LIST_ITEM_DESELECTED
 wxEVT_COMMAND_LIST_KEY_DOWN = wx._controls.wxEVT_COMMAND_LIST_KEY_DOWN
 wxEVT_COMMAND_LIST_ITEM_SELECTED = wx._controls.wxEVT_COMMAND_LIST_ITEM_SELECTED
 wxEVT_COMMAND_LIST_ITEM_DESELECTED = wx._controls.wxEVT_COMMAND_LIST_ITEM_DESELECTED
 wxEVT_COMMAND_LIST_KEY_DOWN = wx._controls.wxEVT_COMMAND_LIST_KEY_DOWN


@@ -351,11 +358,10 @@ 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
 wxListCtrl = wx._controls.ListCtrl
 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
 wxListCtrl = wx._controls.ListCtrl

-wxListCtrlPtr = wx._controls.ListCtrlPtr
+wxListCtrl = wx._controls.ListCtrl

 wxPreListCtrl = wx._controls.PreListCtrl
 wxListCtrl_GetClassDefaultAttributes = wx._controls.ListCtrl_GetClassDefaultAttributes
 wxListView = wx._controls.ListView
 wxPreListCtrl = wx._controls.PreListCtrl
 wxListCtrl_GetClassDefaultAttributes = wx._controls.ListCtrl_GetClassDefaultAttributes
 wxListView = wx._controls.ListView

-wxListViewPtr = wx._controls.ListViewPtr

 wxPreListView = wx._controls.PreListView
 wxTreeCtrlNameStr = wx._controls.TreeCtrlNameStr
 wxTR_NO_BUTTONS = wx._controls.TR_NO_BUTTONS
 wxPreListView = wx._controls.PreListView
 wxTreeCtrlNameStr = wx._controls.TreeCtrlNameStr
 wxTR_NO_BUTTONS = wx._controls.TR_NO_BUTTONS


@@ -372,8 +378,6 @@ wxTR_ROW_LINES = wx._controls.TR_ROW_LINES
 wxTR_FULL_ROW_HIGHLIGHT = wx._controls.TR_FULL_ROW_HIGHLIGHT
 wxTR_DEFAULT_STYLE = wx._controls.TR_DEFAULT_STYLE
 wxTR_TWIST_BUTTONS = wx._controls.TR_TWIST_BUTTONS
 wxTR_FULL_ROW_HIGHLIGHT = wx._controls.TR_FULL_ROW_HIGHLIGHT
 wxTR_DEFAULT_STYLE = wx._controls.TR_DEFAULT_STYLE
 wxTR_TWIST_BUTTONS = wx._controls.TR_TWIST_BUTTONS

-wxTR_MAC_BUTTONS = wx._controls.TR_MAC_BUTTONS
-wxTR_AQUA_BUTTONS = wx._controls.TR_AQUA_BUTTONS

 wxTreeItemIcon_Normal = wx._controls.TreeItemIcon_Normal
 wxTreeItemIcon_Selected = wx._controls.TreeItemIcon_Selected
 wxTreeItemIcon_Expanded = wx._controls.TreeItemIcon_Expanded
 wxTreeItemIcon_Normal = wx._controls.TreeItemIcon_Normal
 wxTreeItemIcon_Selected = wx._controls.TreeItemIcon_Selected
 wxTreeItemIcon_Expanded = wx._controls.TreeItemIcon_Expanded


@@ -394,9 +398,8 @@ wxTREE_HITTEST_ONITEMUPPERPART = wx._controls.TREE_HITTEST_ONITEMUPPERPART
 wxTREE_HITTEST_ONITEMLOWERPART = wx._controls.TREE_HITTEST_ONITEMLOWERPART
 wxTREE_HITTEST_ONITEM = wx._controls.TREE_HITTEST_ONITEM
 wxTreeItemId = wx._controls.TreeItemId
 wxTREE_HITTEST_ONITEMLOWERPART = wx._controls.TREE_HITTEST_ONITEMLOWERPART
 wxTREE_HITTEST_ONITEM = wx._controls.TREE_HITTEST_ONITEM
 wxTreeItemId = wx._controls.TreeItemId

-wxTreeItemIdPtr = wx._controls.TreeItemIdPtr

 wxTreeItemData = wx._controls.TreeItemData
 wxTreeItemData = wx._controls.TreeItemData

-wxTreeItemDataPtr = wx._controls.TreeItemDataPtr
+wxTreeItemData = wx._controls.TreeItemData

 wxEVT_COMMAND_TREE_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_DRAG
 wxEVT_COMMAND_TREE_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_RDRAG
 wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wx._controls.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT
 wxEVT_COMMAND_TREE_BEGIN_DRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_DRAG
 wxEVT_COMMAND_TREE_BEGIN_RDRAG = wx._controls.wxEVT_COMMAND_TREE_BEGIN_RDRAG
 wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wx._controls.wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT


@@ -417,10 +420,10 @@ wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wx._controls.wxEVT_COMMAND_TREE_ITEM_MIDD
 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
 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

+wxEVT_COMMAND_TREE_ITEM_MENU = wx._controls.wxEVT_COMMAND_TREE_ITEM_MENU

 wxTreeEvent = wx._controls.TreeEvent
 wxTreeEvent = wx._controls.TreeEvent

-wxTreeEventPtr = wx._controls.TreeEventPtr

 wxTreeCtrl = wx._controls.TreeCtrl
 wxTreeCtrl = wx._controls.TreeCtrl

-wxTreeCtrlPtr = wx._controls.TreeCtrlPtr
+wxTreeCtrl = wx._controls.TreeCtrl

 wxPreTreeCtrl = wx._controls.PreTreeCtrl
 wxTreeCtrl_GetClassDefaultAttributes = wx._controls.TreeCtrl_GetClassDefaultAttributes
 wxDirDialogDefaultFolderStr = wx._controls.DirDialogDefaultFolderStr
 wxPreTreeCtrl = wx._controls.PreTreeCtrl
 wxTreeCtrl_GetClassDefaultAttributes = wx._controls.TreeCtrl_GetClassDefaultAttributes
 wxDirDialogDefaultFolderStr = wx._controls.DirDialogDefaultFolderStr


@@ -430,36 +433,34 @@ wxDIRCTRL_SHOW_FILTERS = wx._controls.DIRCTRL_SHOW_FILTERS
 wxDIRCTRL_3D_INTERNAL = wx._controls.DIRCTRL_3D_INTERNAL
 wxDIRCTRL_EDIT_LABELS = wx._controls.DIRCTRL_EDIT_LABELS
 wxGenericDirCtrl = wx._controls.GenericDirCtrl
 wxDIRCTRL_3D_INTERNAL = wx._controls.DIRCTRL_3D_INTERNAL
 wxDIRCTRL_EDIT_LABELS = wx._controls.DIRCTRL_EDIT_LABELS
 wxGenericDirCtrl = wx._controls.GenericDirCtrl

-wxGenericDirCtrlPtr = wx._controls.GenericDirCtrlPtr

 wxPreGenericDirCtrl = wx._controls.PreGenericDirCtrl
 wxDirFilterListCtrl = wx._controls.DirFilterListCtrl
 wxPreGenericDirCtrl = wx._controls.PreGenericDirCtrl
 wxDirFilterListCtrl = wx._controls.DirFilterListCtrl

-wxDirFilterListCtrlPtr = wx._controls.DirFilterListCtrlPtr

 wxPreDirFilterListCtrl = wx._controls.PreDirFilterListCtrl
 wxPyControl = wx._controls.PyControl
 wxPreDirFilterListCtrl = wx._controls.PreDirFilterListCtrl
 wxPyControl = wx._controls.PyControl

-wxPyControlPtr = wx._controls.PyControlPtr

 wxPrePyControl = wx._controls.PrePyControl
 wxPrePyControl = wx._controls.PrePyControl

-wxFRAME_EX_CONTEXTHELP = wx._controls.FRAME_EX_CONTEXTHELP
-wxDIALOG_EX_CONTEXTHELP = wx._controls.DIALOG_EX_CONTEXTHELP

 wxEVT_HELP = wx._controls.wxEVT_HELP
 wxEVT_DETAILED_HELP = wx._controls.wxEVT_DETAILED_HELP
 wxHelpEvent = wx._controls.HelpEvent
 wxEVT_HELP = wx._controls.wxEVT_HELP
 wxEVT_DETAILED_HELP = wx._controls.wxEVT_DETAILED_HELP
 wxHelpEvent = wx._controls.HelpEvent

-wxHelpEventPtr = wx._controls.HelpEventPtr

 wxContextHelp = wx._controls.ContextHelp
 wxContextHelp = wx._controls.ContextHelp

-wxContextHelpPtr = wx._controls.ContextHelpPtr

 wxContextHelpButton = wx._controls.ContextHelpButton
 wxContextHelpButton = wx._controls.ContextHelpButton

-wxContextHelpButtonPtr = wx._controls.ContextHelpButtonPtr

 wxHelpProvider = wx._controls.HelpProvider
 wxHelpProvider = wx._controls.HelpProvider

-wxHelpProviderPtr = wx._controls.HelpProviderPtr

 wxHelpProvider_Set = wx._controls.HelpProvider_Set
 wxHelpProvider_Get = wx._controls.HelpProvider_Get
 wxSimpleHelpProvider = wx._controls.SimpleHelpProvider
 wxHelpProvider_Set = wx._controls.HelpProvider_Set
 wxHelpProvider_Get = wx._controls.HelpProvider_Get
 wxSimpleHelpProvider = wx._controls.SimpleHelpProvider

-wxSimpleHelpProviderPtr = wx._controls.SimpleHelpProviderPtr

 wxDragImage = wx._controls.DragImage
 wxDragImage = wx._controls.DragImage

-wxDragImagePtr = wx._controls.DragImagePtr
+wxDragImage = wx._controls.DragImage

 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

+wxDatePickerCtrlNameStr = wx._controls.DatePickerCtrlNameStr
+wxDP_DEFAULT = wx._controls.DP_DEFAULT
+wxDP_SPIN = wx._controls.DP_SPIN
+wxDP_DROPDOWN = wx._controls.DP_DROPDOWN
+wxDP_SHOWCENTURY = wx._controls.DP_SHOWCENTURY
+wxDP_ALLOWNONE = wx._controls.DP_ALLOWNONE
+wxDatePickerCtrl = wx._controls.DatePickerCtrl
+wxPreDatePickerCtrl = wx._controls.PreDatePickerCtrl

 
 
 d = globals()
 
 
 d = globals()