From 98ffccc725a5538a8410f1c28e7686f27d2ec370 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 26 Apr 2013 07:04:50 +0000 Subject: [PATCH] Switch to new shortened wxEventType names. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/choicebk.py | 8 ++++-- etg/collpane.py | 8 ++++-- etg/dataview.py | 59 +++++++++++++++++++++++++++------------- etg/dirctrl.py | 3 +++ etg/fdrepdlg.py | 17 ++++++++---- etg/headerctrl.py | 41 +++++++++++++++++++--------- etg/htmlwin.py | 11 +++++--- etg/hyperlink.py | 6 +++-- etg/listbook.py | 8 ++++-- etg/listctrl.py | 62 ++++++++++++++++++++++++++++-------------- etg/notebook.py | 19 ++++++++----- etg/pickers.py | 18 ++++++++++--- etg/spinctrl.py | 8 ++++-- etg/splitter.py | 14 +++++++--- etg/srchctrl.py | 8 ++++-- etg/textctrl.py | 23 +++++++++++----- etg/tglbtn.py | 6 ++++- etg/toolbook.py | 8 ++++-- etg/treebook.py | 14 +++++++--- etg/treectrl.py | 65 +++++++++++++++++++++++++++++--------------- etg/treelist.py | 23 +++++++++++----- etg/webview.py | 21 ++++++++++----- src/event_ex.py | 69 ++++++++++++++++++++++++++++++++--------------- 23 files changed, 362 insertions(+), 157 deletions(-) diff --git a/etg/choicebk.py b/etg/choicebk.py index acab4745..3ed5657f 100644 --- a/etg/choicebk.py +++ b/etg/choicebk.py @@ -39,8 +39,12 @@ def run(): tools.fixBookctrlClass(c) module.addPyCode("""\ - EVT_CHOICEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, 1 ) - EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, 1 ) + EVT_CHOICEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_CHOICEBOOK_PAGE_CHANGED, 1 ) + EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_CHOICEBOOK_PAGE_CHANGING, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxEVT_CHOICEBOOK_PAGE_CHANGED + wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxEVT_CHOICEBOOK_PAGE_CHANGING """) #----------------------------------------------------------------- diff --git a/etg/collpane.py b/etg/collpane.py index dfaea91b..e5946702 100644 --- a/etg/collpane.py +++ b/etg/collpane.py @@ -34,8 +34,12 @@ def run(): # customizing the generated code and docstrings. module.addHeaderCode("#include ") - module.addPyCode( - "EVT_COLLAPSIBLEPANE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_COLLPANE_CHANGED )") + module.addPyCode("""\ + EVT_COLLAPSIBLEPANE_CHANGED = wx.PyEventBinder( wxEVT_COLLAPSIBLEPANE_CHANGED ) + + # deprecated wxEVT alias + wxEVT_COMMAND_COLLPANE_CHANGED = wxEVT_COLLAPSIBLEPANE_CHANGED + """) c = module.find('wxCollapsiblePane') c.find('wxCollapsiblePane.label').default = 'wxEmptyString' diff --git a/etg/dataview.py b/etg/dataview.py index f6bbf468..d48941c0 100644 --- a/etg/dataview.py +++ b/etg/dataview.py @@ -384,25 +384,46 @@ def run(): """) module.addPyCode("""\ - EVT_DATAVIEW_SELECTION_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, 1) - EVT_DATAVIEW_ITEM_ACTIVATED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, 1) - EVT_DATAVIEW_ITEM_COLLAPSED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, 1) - EVT_DATAVIEW_ITEM_EXPANDED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, 1) - EVT_DATAVIEW_ITEM_COLLAPSING = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, 1) - EVT_DATAVIEW_ITEM_EXPANDING = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, 1) - EVT_DATAVIEW_ITEM_START_EDITING = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING, 1) - EVT_DATAVIEW_ITEM_EDITING_STARTED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, 1) - EVT_DATAVIEW_ITEM_EDITING_DONE = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, 1) - EVT_DATAVIEW_ITEM_VALUE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, 1) - EVT_DATAVIEW_ITEM_CONTEXT_MENU = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, 1) - EVT_DATAVIEW_COLUMN_HEADER_CLICK = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, 1) - EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, 1) - EVT_DATAVIEW_COLUMN_SORTED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, 1) - EVT_DATAVIEW_COLUMN_REORDERED = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED, 1) - EVT_DATAVIEW_ITEM_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG, 1) - EVT_DATAVIEW_ITEM_DROP_POSSIBLE = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE, 1) - EVT_DATAVIEW_ITEM_DROP = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_ITEM_DROP, 1) - EVT_DATAVIEW_CACHE_HINT = wx.PyEventBinder( wxEVT_COMMAND_DATAVIEW_CACHE_HINT, 1 ) + EVT_DATAVIEW_SELECTION_CHANGED = wx.PyEventBinder( wxEVT_DATAVIEW_SELECTION_CHANGED, 1) + EVT_DATAVIEW_ITEM_ACTIVATED = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_ACTIVATED, 1) + EVT_DATAVIEW_ITEM_COLLAPSED = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_COLLAPSED, 1) + EVT_DATAVIEW_ITEM_EXPANDED = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_EXPANDED, 1) + EVT_DATAVIEW_ITEM_COLLAPSING = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_COLLAPSING, 1) + EVT_DATAVIEW_ITEM_EXPANDING = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_EXPANDING, 1) + EVT_DATAVIEW_ITEM_START_EDITING = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_START_EDITING, 1) + EVT_DATAVIEW_ITEM_EDITING_STARTED = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_EDITING_STARTED, 1) + EVT_DATAVIEW_ITEM_EDITING_DONE = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_EDITING_DONE, 1) + EVT_DATAVIEW_ITEM_VALUE_CHANGED = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, 1) + EVT_DATAVIEW_ITEM_CONTEXT_MENU = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, 1) + EVT_DATAVIEW_COLUMN_HEADER_CLICK = wx.PyEventBinder( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, 1) + EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK = wx.PyEventBinder( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, 1) + EVT_DATAVIEW_COLUMN_SORTED = wx.PyEventBinder( wxEVT_DATAVIEW_COLUMN_SORTED, 1) + EVT_DATAVIEW_COLUMN_REORDERED = wx.PyEventBinder( wxEVT_DATAVIEW_COLUMN_REORDERED, 1) + EVT_DATAVIEW_ITEM_BEGIN_DRAG = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, 1) + EVT_DATAVIEW_ITEM_DROP_POSSIBLE = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE, 1) + EVT_DATAVIEW_ITEM_DROP = wx.PyEventBinder( wxEVT_DATAVIEW_ITEM_DROP, 1) + EVT_DATAVIEW_CACHE_HINT = wx.PyEventBinder( wxEVT_DATAVIEW_CACHE_HINT, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED = wxEVT_DATAVIEW_SELECTION_CHANGED + wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED = wxEVT_DATAVIEW_ITEM_ACTIVATED + wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED = wxEVT_DATAVIEW_ITEM_COLLAPSED + wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED = wxEVT_DATAVIEW_ITEM_EXPANDED + wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING = wxEVT_DATAVIEW_ITEM_COLLAPSING + wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING = wxEVT_DATAVIEW_ITEM_EXPANDING + wxEVT_COMMAND_DATAVIEW_ITEM_START_EDITING = wxEVT_DATAVIEW_ITEM_START_EDITING + wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED = wxEVT_DATAVIEW_ITEM_EDITING_STARTED + wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE = wxEVT_DATAVIEW_ITEM_EDITING_DONE + wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED = wxEVT_DATAVIEW_ITEM_VALUE_CHANGED + wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU = wxEVT_DATAVIEW_ITEM_CONTEXT_MENU + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK = wxEVT_DATAVIEW_COLUMN_HEADER_CLICK + wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK = wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK + wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED = wxEVT_DATAVIEW_COLUMN_SORTED + wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED = wxEVT_DATAVIEW_COLUMN_REORDERED + wxEVT_COMMAND_DATAVIEW_CACHE_HINT = wxEVT_DATAVIEW_CACHE_HINT + wxEVT_COMMAND_DATAVIEW_ITEM_BEGIN_DRAG = wxEVT_DATAVIEW_ITEM_BEGIN_DRAG + wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE = wxEVT_DATAVIEW_ITEM_DROP_POSSIBLE + wxEVT_COMMAND_DATAVIEW_ITEM_DROP = wxEVT_DATAVIEW_ITEM_DROP """) #----------------------------------------------------------------- diff --git a/etg/dirctrl.py b/etg/dirctrl.py index 978307b8..b96ffe98 100644 --- a/etg/dirctrl.py +++ b/etg/dirctrl.py @@ -38,6 +38,9 @@ def run(): assert isinstance(c, etgtools.ClassDef) tools.fixTopLevelWindowClass(c) + c.addPyCode("""\ + EVT_DIRCTRL_CHANGED = wx.PyEventBinder( wxEVT_DIRCTRL_CHANGED, 1 ) + """) #----------------------------------------------------------------- tools.doCommonTweaks(module) diff --git a/etg/fdrepdlg.py b/etg/fdrepdlg.py index 04194c3c..4010c0dd 100644 --- a/etg/fdrepdlg.py +++ b/etg/fdrepdlg.py @@ -38,11 +38,18 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_FIND = wx.PyEventBinder( wxEVT_COMMAND_FIND, 1 ) - EVT_FIND_NEXT = wx.PyEventBinder( wxEVT_COMMAND_FIND_NEXT, 1 ) - EVT_FIND_REPLACE = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE, 1 ) - EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 ) - EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 ) + EVT_FIND = wx.PyEventBinder( wxEVT_FIND, 1 ) + EVT_FIND_NEXT = wx.PyEventBinder( wxEVT_FIND_NEXT, 1 ) + EVT_FIND_REPLACE = wx.PyEventBinder( wxEVT_FIND_REPLACE, 1 ) + EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_FIND_REPLACE_ALL, 1 ) + EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_FIND_CLOSE, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_FIND = wxEVT_FIND + wxEVT_COMMAND_FIND_NEXT = wxEVT_FIND_NEXT + wxEVT_COMMAND_FIND_REPLACE = wxEVT_FIND_REPLACE + wxEVT_COMMAND_FIND_REPLACE_ALL = wxEVT_FIND_REPLACE_ALL + wxEVT_COMMAND_FIND_CLOSE = wxEVT_FIND_CLOSE """) c = module.find('wxFindReplaceDialog') diff --git a/etg/headerctrl.py b/etg/headerctrl.py index 78b1e108..c1d70209 100644 --- a/etg/headerctrl.py +++ b/etg/headerctrl.py @@ -81,19 +81,34 @@ def run(): tools.fixEventClass(c) module.addPyCode("""\ - EVT_HEADER_CLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_CLICK ) - EVT_HEADER_RIGHT_CLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_RIGHT_CLICK ) - EVT_HEADER_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_MIDDLE_CLICK ) - EVT_HEADER_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_DCLICK ) - EVT_HEADER_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_RIGHT_DCLICK ) - EVT_HEADER_MIDDLE_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_MIDDLE_DCLICK ) - EVT_HEADER_SEPARATOR_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK ) - EVT_HEADER_BEGIN_RESIZE = wx.PyEventBinder( wxEVT_COMMAND_HEADER_BEGIN_RESIZE ) - EVT_HEADER_RESIZING = wx.PyEventBinder( wxEVT_COMMAND_HEADER_RESIZING ) - EVT_HEADER_END_RESIZE = wx.PyEventBinder( wxEVT_COMMAND_HEADER_END_RESIZE ) - EVT_HEADER_BEGIN_REORDER = wx.PyEventBinder( wxEVT_COMMAND_HEADER_BEGIN_REORDER ) - EVT_HEADER_END_REORDER = wx.PyEventBinder( wxEVT_COMMAND_HEADER_END_REORDER ) - EVT_HEADER_DRAGGING_CANCELLED = wx.PyEventBinder( wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED ) + EVT_HEADER_CLICK = wx.PyEventBinder( wxEVT_HEADER_CLICK ) + EVT_HEADER_RIGHT_CLICK = wx.PyEventBinder( wxEVT_HEADER_RIGHT_CLICK ) + EVT_HEADER_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_HEADER_MIDDLE_CLICK ) + EVT_HEADER_DCLICK = wx.PyEventBinder( wxEVT_HEADER_DCLICK ) + EVT_HEADER_RIGHT_DCLICK = wx.PyEventBinder( wxEVT_HEADER_RIGHT_DCLICK ) + EVT_HEADER_MIDDLE_DCLICK = wx.PyEventBinder( wxEVT_HEADER_MIDDLE_DCLICK ) + EVT_HEADER_SEPARATOR_DCLICK = wx.PyEventBinder( wxEVT_HEADER_SEPARATOR_DCLICK ) + EVT_HEADER_BEGIN_RESIZE = wx.PyEventBinder( wxEVT_HEADER_BEGIN_RESIZE ) + EVT_HEADER_RESIZING = wx.PyEventBinder( wxEVT_HEADER_RESIZING ) + EVT_HEADER_END_RESIZE = wx.PyEventBinder( wxEVT_HEADER_END_RESIZE ) + EVT_HEADER_BEGIN_REORDER = wx.PyEventBinder( wxEVT_HEADER_BEGIN_REORDER ) + EVT_HEADER_END_REORDER = wx.PyEventBinder( wxEVT_HEADER_END_REORDER ) + EVT_HEADER_DRAGGING_CANCELLED = wx.PyEventBinder( wxEVT_HEADER_DRAGGING_CANCELLED ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_HEADER_CLICK = wxEVT_HEADER_CLICK + wxEVT_COMMAND_HEADER_RIGHT_CLICK = wxEVT_HEADER_RIGHT_CLICK + wxEVT_COMMAND_HEADER_MIDDLE_CLICK = wxEVT_HEADER_MIDDLE_CLICK + wxEVT_COMMAND_HEADER_DCLICK = wxEVT_HEADER_DCLICK + wxEVT_COMMAND_HEADER_RIGHT_DCLICK = wxEVT_HEADER_RIGHT_DCLICK + wxEVT_COMMAND_HEADER_MIDDLE_DCLICK = wxEVT_HEADER_MIDDLE_DCLICK + wxEVT_COMMAND_HEADER_SEPARATOR_DCLICK = wxEVT_HEADER_SEPARATOR_DCLICK + wxEVT_COMMAND_HEADER_BEGIN_RESIZE = wxEVT_HEADER_BEGIN_RESIZE + wxEVT_COMMAND_HEADER_RESIZING = wxEVT_HEADER_RESIZING + wxEVT_COMMAND_HEADER_END_RESIZE = wxEVT_HEADER_END_RESIZE + wxEVT_COMMAND_HEADER_BEGIN_REORDER = wxEVT_HEADER_BEGIN_REORDER + wxEVT_COMMAND_HEADER_END_REORDER = wxEVT_HEADER_END_REORDER + wxEVT_COMMAND_HEADER_DRAGGING_CANCELLED = wxEVT_HEADER_DRAGGING_CANCELLED """) #----------------------------------------------------------------- diff --git a/etg/htmlwin.py b/etg/htmlwin.py index 186e9339..f123abe5 100644 --- a/etg/htmlwin.py +++ b/etg/htmlwin.py @@ -68,9 +68,14 @@ def run(): tools.fixEventClass(c) module.addPyCode("""\ - EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 ) - EVT_HTML_CELL_HOVER = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 ) - EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 ) + EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_HTML_CELL_CLICKED, 1 ) + EVT_HTML_CELL_HOVER = wx.PyEventBinder( wxEVT_HTML_CELL_HOVER, 1 ) + EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_HTML_LINK_CLICKED, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_HTML_CELL_CLICKED = wxEVT_HTML_CELL_CLICKED + wxEVT_COMMAND_HTML_CELL_HOVER = wxEVT_HTML_CELL_HOVER + wxEVT_COMMAND_HTML_LINK_CLICKED = wxEVT_HTML_LINK_CLICKED """) diff --git a/etg/hyperlink.py b/etg/hyperlink.py index 3c168261..3427d946 100644 --- a/etg/hyperlink.py +++ b/etg/hyperlink.py @@ -38,7 +38,10 @@ def run(): assert isinstance(c, etgtools.ClassDef) tools.fixEventClass(c) c.addPyCode("""\ - EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 ) + EVT_HYPERLINK = wx.PyEventBinder( wxEVT_HYPERLINK, 1 ) + + # deprecated wxEVT alias + wxEVT_COMMAND_HYPERLINK = wxEVT_HYPERLINK """) c = module.find('wxHyperlinkCtrl') @@ -48,7 +51,6 @@ def run(): c.find('wxHyperlinkCtrl.url').default = 'wxEmptyString' c.find('Create.label').default = 'wxEmptyString' c.find('Create.url').default = 'wxEmptyString' - module.addGlobalStr('wxHyperlinkCtrlNameStr', c) diff --git a/etg/listbook.py b/etg/listbook.py index b2b6510c..719e113c 100644 --- a/etg/listbook.py +++ b/etg/listbook.py @@ -39,8 +39,12 @@ def run(): tools.fixBookctrlClass(c) module.addPyCode("""\ - EVT_LISTBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, 1 ) - EVT_LISTBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, 1 ) + EVT_LISTBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_LISTBOOK_PAGE_CHANGED, 1 ) + EVT_LISTBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_LISTBOOK_PAGE_CHANGING, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED = wxEVT_LISTBOOK_PAGE_CHANGED + wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING = wxEVT_LISTBOOK_PAGE_CHANGING """) #----------------------------------------------------------------- diff --git a/etg/listctrl.py b/etg/listctrl.py index c487d70e..f604abd0 100644 --- a/etg/listctrl.py +++ b/etg/listctrl.py @@ -326,26 +326,48 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_LIST_BEGIN_DRAG = PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1) - EVT_LIST_BEGIN_RDRAG = PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1) - EVT_LIST_BEGIN_LABEL_EDIT = PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1) - EVT_LIST_END_LABEL_EDIT = PyEventBinder(wxEVT_COMMAND_LIST_END_LABEL_EDIT , 1) - EVT_LIST_DELETE_ITEM = PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ITEM , 1) - EVT_LIST_DELETE_ALL_ITEMS = PyEventBinder(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS , 1) - EVT_LIST_ITEM_SELECTED = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_SELECTED , 1) - EVT_LIST_ITEM_DESELECTED = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_DESELECTED , 1) - EVT_LIST_KEY_DOWN = PyEventBinder(wxEVT_COMMAND_LIST_KEY_DOWN , 1) - EVT_LIST_INSERT_ITEM = PyEventBinder(wxEVT_COMMAND_LIST_INSERT_ITEM , 1) - EVT_LIST_COL_CLICK = PyEventBinder(wxEVT_COMMAND_LIST_COL_CLICK , 1) - EVT_LIST_ITEM_RIGHT_CLICK = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK , 1) - EVT_LIST_ITEM_MIDDLE_CLICK = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK, 1) - EVT_LIST_ITEM_ACTIVATED = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_ACTIVATED , 1) - EVT_LIST_CACHE_HINT = PyEventBinder(wxEVT_COMMAND_LIST_CACHE_HINT , 1) - EVT_LIST_COL_RIGHT_CLICK = PyEventBinder(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK , 1) - EVT_LIST_COL_BEGIN_DRAG = PyEventBinder(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG , 1) - EVT_LIST_COL_DRAGGING = PyEventBinder(wxEVT_COMMAND_LIST_COL_DRAGGING , 1) - EVT_LIST_COL_END_DRAG = PyEventBinder(wxEVT_COMMAND_LIST_COL_END_DRAG , 1) - EVT_LIST_ITEM_FOCUSED = PyEventBinder(wxEVT_COMMAND_LIST_ITEM_FOCUSED , 1) + EVT_LIST_BEGIN_DRAG = PyEventBinder(wxEVT_LIST_BEGIN_DRAG , 1) + EVT_LIST_BEGIN_RDRAG = PyEventBinder(wxEVT_LIST_BEGIN_RDRAG , 1) + EVT_LIST_BEGIN_LABEL_EDIT = PyEventBinder(wxEVT_LIST_BEGIN_LABEL_EDIT , 1) + EVT_LIST_END_LABEL_EDIT = PyEventBinder(wxEVT_LIST_END_LABEL_EDIT , 1) + EVT_LIST_DELETE_ITEM = PyEventBinder(wxEVT_LIST_DELETE_ITEM , 1) + EVT_LIST_DELETE_ALL_ITEMS = PyEventBinder(wxEVT_LIST_DELETE_ALL_ITEMS , 1) + EVT_LIST_ITEM_SELECTED = PyEventBinder(wxEVT_LIST_ITEM_SELECTED , 1) + EVT_LIST_ITEM_DESELECTED = PyEventBinder(wxEVT_LIST_ITEM_DESELECTED , 1) + EVT_LIST_KEY_DOWN = PyEventBinder(wxEVT_LIST_KEY_DOWN , 1) + EVT_LIST_INSERT_ITEM = PyEventBinder(wxEVT_LIST_INSERT_ITEM , 1) + EVT_LIST_COL_CLICK = PyEventBinder(wxEVT_LIST_COL_CLICK , 1) + EVT_LIST_ITEM_RIGHT_CLICK = PyEventBinder(wxEVT_LIST_ITEM_RIGHT_CLICK , 1) + EVT_LIST_ITEM_MIDDLE_CLICK = PyEventBinder(wxEVT_LIST_ITEM_MIDDLE_CLICK, 1) + EVT_LIST_ITEM_ACTIVATED = PyEventBinder(wxEVT_LIST_ITEM_ACTIVATED , 1) + EVT_LIST_CACHE_HINT = PyEventBinder(wxEVT_LIST_CACHE_HINT , 1) + EVT_LIST_COL_RIGHT_CLICK = PyEventBinder(wxEVT_LIST_COL_RIGHT_CLICK , 1) + EVT_LIST_COL_BEGIN_DRAG = PyEventBinder(wxEVT_LIST_COL_BEGIN_DRAG , 1) + EVT_LIST_COL_DRAGGING = PyEventBinder(wxEVT_LIST_COL_DRAGGING , 1) + EVT_LIST_COL_END_DRAG = PyEventBinder(wxEVT_LIST_COL_END_DRAG , 1) + EVT_LIST_ITEM_FOCUSED = PyEventBinder(wxEVT_LIST_ITEM_FOCUSED , 1) + + # deprecated wxEVT aliases + wxEVT_COMMAND_LIST_BEGIN_DRAG = wxEVT_LIST_BEGIN_DRAG + wxEVT_COMMAND_LIST_BEGIN_RDRAG = wxEVT_LIST_BEGIN_RDRAG + wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = wxEVT_LIST_BEGIN_LABEL_EDIT + wxEVT_COMMAND_LIST_END_LABEL_EDIT = wxEVT_LIST_END_LABEL_EDIT + wxEVT_COMMAND_LIST_DELETE_ITEM = wxEVT_LIST_DELETE_ITEM + wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = wxEVT_LIST_DELETE_ALL_ITEMS + wxEVT_COMMAND_LIST_ITEM_SELECTED = wxEVT_LIST_ITEM_SELECTED + wxEVT_COMMAND_LIST_ITEM_DESELECTED = wxEVT_LIST_ITEM_DESELECTED + wxEVT_COMMAND_LIST_KEY_DOWN = wxEVT_LIST_KEY_DOWN + wxEVT_COMMAND_LIST_INSERT_ITEM = wxEVT_LIST_INSERT_ITEM + wxEVT_COMMAND_LIST_COL_CLICK = wxEVT_LIST_COL_CLICK + wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK = wxEVT_LIST_ITEM_RIGHT_CLICK + wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK = wxEVT_LIST_ITEM_MIDDLE_CLICK + wxEVT_COMMAND_LIST_ITEM_ACTIVATED = wxEVT_LIST_ITEM_ACTIVATED + wxEVT_COMMAND_LIST_CACHE_HINT = wxEVT_LIST_CACHE_HINT + wxEVT_COMMAND_LIST_COL_RIGHT_CLICK = wxEVT_LIST_COL_RIGHT_CLICK + wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = wxEVT_LIST_COL_BEGIN_DRAG + wxEVT_COMMAND_LIST_COL_DRAGGING = wxEVT_LIST_COL_DRAGGING + wxEVT_COMMAND_LIST_COL_END_DRAG = wxEVT_LIST_COL_END_DRAG + wxEVT_COMMAND_LIST_ITEM_FOCUSED = wxEVT_LIST_ITEM_FOCUSED """) #----------------------------------------------------------------- diff --git a/etg/notebook.py b/etg/notebook.py index 5feaa932..a605982d 100644 --- a/etg/notebook.py +++ b/etg/notebook.py @@ -40,17 +40,24 @@ def run(): module.addGlobalStr('wxNotebookNameStr', c) module.addPyCode("""\ - EVT_NOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, 1 ) - EVT_NOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, 1 ) + EVT_NOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_NOTEBOOK_PAGE_CHANGED, 1 ) + EVT_NOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_NOTEBOOK_PAGE_CHANGING, 1 ) """) module.addPyCode("""\ # Aliases for the "best book" control as described in the overview BookCtrl = Notebook - wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED = wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED - wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING = wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING - EVT_BOOKCTRL_PAGE_CHANGED = EVT_NOTEBOOK_PAGE_CHANGED - EVT_BOOKCTRL_PAGE_CHANGING = EVT_NOTEBOOK_PAGE_CHANGING + wxEVT_BOOKCTRL_PAGE_CHANGED = wxEVT_NOTEBOOK_PAGE_CHANGED + wxEVT_BOOKCTRL_PAGE_CHANGING = wxEVT_NOTEBOOK_PAGE_CHANGING + EVT_BOOKCTRL_PAGE_CHANGED = EVT_NOTEBOOK_PAGE_CHANGED + EVT_BOOKCTRL_PAGE_CHANGING = EVT_NOTEBOOK_PAGE_CHANGING + + # deprecated wxEVT aliases + wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGED = wxEVT_BOOKCTRL_PAGE_CHANGED + wxEVT_COMMAND_BOOKCTRL_PAGE_CHANGING = wxEVT_BOOKCTRL_PAGE_CHANGING + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = wxEVT_NOTEBOOK_PAGE_CHANGED + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = wxEVT_NOTEBOOK_PAGE_CHANGING + """) diff --git a/etg/pickers.py b/etg/pickers.py index 1f22ad8f..ab5b4f9d 100644 --- a/etg/pickers.py +++ b/etg/pickers.py @@ -63,7 +63,10 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_COLOURPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_COLOURPICKER_CHANGED, 1 ) + EVT_COLOURPICKER_CHANGED = wx.PyEventBinder( wxEVT_COLOURPICKER_CHANGED, 1 ) + + # deprecated wxEVT alias + wxEVT_COMMAND_COLOURPICKER_CHANGED = wxEVT_COLOURPICKER_CHANGED """) @@ -108,8 +111,12 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_FILEPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_FILEPICKER_CHANGED, 1 ) - EVT_DIRPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_DIRPICKER_CHANGED, 1 ) + EVT_FILEPICKER_CHANGED = wx.PyEventBinder( wxEVT_FILEPICKER_CHANGED, 1 ) + EVT_DIRPICKER_CHANGED = wx.PyEventBinder( wxEVT_DIRPICKER_CHANGED, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_FILEPICKER_CHANGED = wxEVT_FILEPICKER_CHANGED + wxEVT_COMMAND_DIRPICKER_CHANGED = wxEVT_DIRPICKER_CHANGED """) #----------------------------------------------------------------- @@ -130,7 +137,10 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_FONTPICKER_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_FONTPICKER_CHANGED, 1 ) + EVT_FONTPICKER_CHANGED = wx.PyEventBinder( wxEVT_FONTPICKER_CHANGED, 1 ) + + # deprecated wxEVT alias + wxEVT_COMMAND_FONTPICKER_CHANGED = wxEVT_FONTPICKER_CHANGED """) #----------------------------------------------------------------- diff --git a/etg/spinctrl.py b/etg/spinctrl.py index 04d5444e..0fcf5c8f 100644 --- a/etg/spinctrl.py +++ b/etg/spinctrl.py @@ -57,8 +57,12 @@ def run(): tools.fixEventClass(c) module.addPyCode("""\ - EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1) - EVT_SPINCTRLDOUBLE = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, 1) + EVT_SPINCTRL = wx.PyEventBinder( wxEVT_SPINCTRL, 1) + EVT_SPINCTRLDOUBLE = wx.PyEventBinder( wxEVT_SPINCTRLDOUBLE, 1) + + # deprecated wxEVT aliases + wxEVT_COMMAND_SPINCTRL_UPDATED = wxEVT_SPINCTRL + wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED = wxEVT_SPINCTRLDOUBLE """) diff --git a/etg/splitter.py b/etg/splitter.py index 803dc829..6bcf797a 100644 --- a/etg/splitter.py +++ b/etg/splitter.py @@ -50,11 +50,17 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_SPLITTER_SASH_POS_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, 1 ) - EVT_SPLITTER_SASH_POS_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, 1 ) - EVT_SPLITTER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, 1 ) - EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_COMMAND_SPLITTER_UNSPLIT, 1 ) + EVT_SPLITTER_SASH_POS_CHANGED = wx.PyEventBinder( wxEVT_SPLITTER_SASH_POS_CHANGED, 1 ) + EVT_SPLITTER_SASH_POS_CHANGING = wx.PyEventBinder( wxEVT_SPLITTER_SASH_POS_CHANGING, 1 ) + EVT_SPLITTER_DOUBLECLICKED = wx.PyEventBinder( wxEVT_SPLITTER_DOUBLECLICKED, 1 ) + EVT_SPLITTER_UNSPLIT = wx.PyEventBinder( wxEVT_SPLITTER_UNSPLIT, 1 ) EVT_SPLITTER_DCLICK = EVT_SPLITTER_DOUBLECLICKED + + # deprecated wxEVT aliases + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_SPLITTER_SASH_POS_CHANGED + wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = wxEVT_SPLITTER_SASH_POS_CHANGING + wxEVT_COMMAND_SPLITTER_DOUBLECLICKED = wxEVT_SPLITTER_DOUBLECLICKED + wxEVT_COMMAND_SPLITTER_UNSPLIT = wxEVT_SPLITTER_UNSPLIT """) #----------------------------------------------------------------- diff --git a/etg/srchctrl.py b/etg/srchctrl.py index 9afcc610..8e067133 100644 --- a/etg/srchctrl.py +++ b/etg/srchctrl.py @@ -109,8 +109,12 @@ def run(): tools.fixWindowClass(searchCtrl) module.addPyCode("""\ - EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1) - EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1) + EVT_SEARCHCTRL_CANCEL_BTN = wx.PyEventBinder( wxEVT_SEARCHCTRL_CANCEL_BTN, 1) + EVT_SEARCHCTRL_SEARCH_BTN = wx.PyEventBinder( wxEVT_SEARCHCTRL_SEARCH_BTN, 1) + + # deprecated wxEVT aliases + wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN = wxEVT_SEARCHCTRL_CANCEL_BTN + wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN = wxEVT_SEARCHCTRL_SEARCH_BTN """) #----------------------------------------------------------------- diff --git a/etg/textctrl.py b/etg/textctrl.py index c80fd0b3..da049114 100644 --- a/etg/textctrl.py +++ b/etg/textctrl.py @@ -71,13 +71,22 @@ def parseAndTweakModule(): c.addPyCode("""\ - EVT_TEXT = wx.PyEventBinder( wxEVT_COMMAND_TEXT_UPDATED, 1) - EVT_TEXT_ENTER = wx.PyEventBinder( wxEVT_COMMAND_TEXT_ENTER, 1) - EVT_TEXT_URL = wx.PyEventBinder( wxEVT_COMMAND_TEXT_URL, 1) - EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_COMMAND_TEXT_MAXLEN, 1) - EVT_TEXT_CUT = wx.PyEventBinder( wxEVT_COMMAND_TEXT_CUT ) - EVT_TEXT_COPY = wx.PyEventBinder( wxEVT_COMMAND_TEXT_COPY ) - EVT_TEXT_PASTE = wx.PyEventBinder( wxEVT_COMMAND_TEXT_PASTE ) + EVT_TEXT = wx.PyEventBinder( wxEVT_TEXT, 1) + EVT_TEXT_ENTER = wx.PyEventBinder( wxEVT_TEXT_ENTER, 1) + EVT_TEXT_URL = wx.PyEventBinder( wxEVT_TEXT_URL, 1) + EVT_TEXT_MAXLEN = wx.PyEventBinder( wxEVT_TEXT_MAXLEN, 1) + EVT_TEXT_CUT = wx.PyEventBinder( wxEVT_TEXT_CUT ) + EVT_TEXT_COPY = wx.PyEventBinder( wxEVT_TEXT_COPY ) + EVT_TEXT_PASTE = wx.PyEventBinder( wxEVT_TEXT_PASTE ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_TEXT_UPDATED = wxEVT_TEXT + wxEVT_COMMAND_TEXT_ENTER = wxEVT_TEXT_ENTER + wxEVT_COMMAND_TEXT_URL = wxEVT_TEXT_URL + wxEVT_COMMAND_TEXT_MAXLEN = wxEVT_TEXT_MAXLEN + wxEVT_COMMAND_TEXT_CUT = wxEVT_TEXT_CUT + wxEVT_COMMAND_TEXT_COPY = wxEVT_TEXT_COPY + wxEVT_COMMAND_TEXT_PASTE = wxEVT_TEXT_PASTE """) return module diff --git a/etg/tglbtn.py b/etg/tglbtn.py index fecbd734..97b9d21c 100644 --- a/etg/tglbtn.py +++ b/etg/tglbtn.py @@ -46,7 +46,11 @@ def run(): tools.fixWindowClass(c) module.addPyCode("""\ - EVT_TOGGLEBUTTON = PyEventBinder(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, 1)""") + EVT_TOGGLEBUTTON = PyEventBinder(wxEVT_TOGGLEBUTTON, 1) + + # deprecated wxEVT alias + wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = wxEVT_TOGGLEBUTTON + """) #----------------------------------------------------------------- tools.doCommonTweaks(module) diff --git a/etg/toolbook.py b/etg/toolbook.py index d8e84c2d..2384b83f 100644 --- a/etg/toolbook.py +++ b/etg/toolbook.py @@ -39,8 +39,12 @@ def run(): tools.fixBookctrlClass(c) module.addPyCode("""\ - EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 1 ) - EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 1 ) + EVT_TOOLBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_TOOLBOOK_PAGE_CHANGED, 1 ) + EVT_TOOLBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_TOOLBOOK_PAGE_CHANGING, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED = wxEVT_TOOLBOOK_PAGE_CHANGED + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING = wxEVT_TOOLBOOK_PAGE_CHANGING """) diff --git a/etg/treebook.py b/etg/treebook.py index 81551cef..5c17812e 100644 --- a/etg/treebook.py +++ b/etg/treebook.py @@ -39,10 +39,16 @@ def run(): tools.fixBookctrlClass(c, True) module.addPyCode("""\ - EVT_TREEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, 1 ) - EVT_TREEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, 1) - EVT_TREEBOOK_NODE_COLLAPSED = wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 1 ) - EVT_TREEBOOK_NODE_EXPANDED = wx.PyEventBinder( wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED, 1 ) + EVT_TREEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_TREEBOOK_PAGE_CHANGED, 1 ) + EVT_TREEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_TREEBOOK_PAGE_CHANGING, 1) + EVT_TREEBOOK_NODE_COLLAPSED = wx.PyEventBinder( wxEVT_TREEBOOK_NODE_COLLAPSED, 1 ) + EVT_TREEBOOK_NODE_EXPANDED = wx.PyEventBinder( wxEVT_TREEBOOK_NODE_EXPANDED, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED = wxEVT_TREEBOOK_PAGE_CHANGED + wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING = wxEVT_TREEBOOK_PAGE_CHANGING + wxEVT_COMMAND_TREEBOOK_NODE_COLLAPSED = wxEVT_TREEBOOK_NODE_COLLAPSED + wxEVT_COMMAND_TREEBOOK_NODE_EXPANDED = wxEVT_TREEBOOK_NODE_EXPANDED """) diff --git a/etg/treectrl.py b/etg/treectrl.py index 036b8c9b..a7814464 100644 --- a/etg/treectrl.py +++ b/etg/treectrl.py @@ -148,27 +148,50 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_TREE_BEGIN_DRAG = PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_DRAG , 1) - EVT_TREE_BEGIN_RDRAG = PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_RDRAG , 1) - EVT_TREE_BEGIN_LABEL_EDIT = PyEventBinder(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT , 1) - EVT_TREE_END_LABEL_EDIT = PyEventBinder(wxEVT_COMMAND_TREE_END_LABEL_EDIT , 1) - EVT_TREE_DELETE_ITEM = PyEventBinder(wxEVT_COMMAND_TREE_DELETE_ITEM , 1) - EVT_TREE_GET_INFO = PyEventBinder(wxEVT_COMMAND_TREE_GET_INFO , 1) - EVT_TREE_SET_INFO = PyEventBinder(wxEVT_COMMAND_TREE_SET_INFO , 1) - EVT_TREE_ITEM_EXPANDED = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_EXPANDED , 1) - EVT_TREE_ITEM_EXPANDING = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_EXPANDING , 1) - EVT_TREE_ITEM_COLLAPSED = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_COLLAPSED , 1) - EVT_TREE_ITEM_COLLAPSING = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_COLLAPSING , 1) - EVT_TREE_SEL_CHANGED = PyEventBinder(wxEVT_COMMAND_TREE_SEL_CHANGED , 1) - EVT_TREE_SEL_CHANGING = PyEventBinder(wxEVT_COMMAND_TREE_SEL_CHANGING , 1) - EVT_TREE_KEY_DOWN = PyEventBinder(wxEVT_COMMAND_TREE_KEY_DOWN , 1) - EVT_TREE_ITEM_ACTIVATED = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_ACTIVATED , 1) - EVT_TREE_ITEM_RIGHT_CLICK = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK , 1) - EVT_TREE_ITEM_MIDDLE_CLICK = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, 1) - EVT_TREE_END_DRAG = PyEventBinder(wxEVT_COMMAND_TREE_END_DRAG , 1) - EVT_TREE_STATE_IMAGE_CLICK = PyEventBinder(wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, 1) - EVT_TREE_ITEM_GETTOOLTIP = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP, 1) - EVT_TREE_ITEM_MENU = PyEventBinder(wxEVT_COMMAND_TREE_ITEM_MENU, 1) + EVT_TREE_BEGIN_DRAG = PyEventBinder(wxEVT_TREE_BEGIN_DRAG , 1) + EVT_TREE_BEGIN_RDRAG = PyEventBinder(wxEVT_TREE_BEGIN_RDRAG , 1) + EVT_TREE_BEGIN_LABEL_EDIT = PyEventBinder(wxEVT_TREE_BEGIN_LABEL_EDIT , 1) + EVT_TREE_END_LABEL_EDIT = PyEventBinder(wxEVT_TREE_END_LABEL_EDIT , 1) + EVT_TREE_DELETE_ITEM = PyEventBinder(wxEVT_TREE_DELETE_ITEM , 1) + EVT_TREE_GET_INFO = PyEventBinder(wxEVT_TREE_GET_INFO , 1) + EVT_TREE_SET_INFO = PyEventBinder(wxEVT_TREE_SET_INFO , 1) + EVT_TREE_ITEM_EXPANDED = PyEventBinder(wxEVT_TREE_ITEM_EXPANDED , 1) + EVT_TREE_ITEM_EXPANDING = PyEventBinder(wxEVT_TREE_ITEM_EXPANDING , 1) + EVT_TREE_ITEM_COLLAPSED = PyEventBinder(wxEVT_TREE_ITEM_COLLAPSED , 1) + EVT_TREE_ITEM_COLLAPSING = PyEventBinder(wxEVT_TREE_ITEM_COLLAPSING , 1) + EVT_TREE_SEL_CHANGED = PyEventBinder(wxEVT_TREE_SEL_CHANGED , 1) + EVT_TREE_SEL_CHANGING = PyEventBinder(wxEVT_TREE_SEL_CHANGING , 1) + EVT_TREE_KEY_DOWN = PyEventBinder(wxEVT_TREE_KEY_DOWN , 1) + EVT_TREE_ITEM_ACTIVATED = PyEventBinder(wxEVT_TREE_ITEM_ACTIVATED , 1) + EVT_TREE_ITEM_RIGHT_CLICK = PyEventBinder(wxEVT_TREE_ITEM_RIGHT_CLICK , 1) + EVT_TREE_ITEM_MIDDLE_CLICK = PyEventBinder(wxEVT_TREE_ITEM_MIDDLE_CLICK, 1) + EVT_TREE_END_DRAG = PyEventBinder(wxEVT_TREE_END_DRAG , 1) + EVT_TREE_STATE_IMAGE_CLICK = PyEventBinder(wxEVT_TREE_STATE_IMAGE_CLICK, 1) + EVT_TREE_ITEM_GETTOOLTIP = PyEventBinder(wxEVT_TREE_ITEM_GETTOOLTIP, 1) + EVT_TREE_ITEM_MENU = PyEventBinder(wxEVT_TREE_ITEM_MENU, 1) + + # deprecated wxEVT aliases + wxEVT_COMMAND_TREE_BEGIN_DRAG = wxEVT_TREE_BEGIN_DRAG + wxEVT_COMMAND_TREE_BEGIN_RDRAG = wxEVT_TREE_BEGIN_RDRAG + wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT = wxEVT_TREE_BEGIN_LABEL_EDIT + wxEVT_COMMAND_TREE_END_LABEL_EDIT = wxEVT_TREE_END_LABEL_EDIT + wxEVT_COMMAND_TREE_DELETE_ITEM = wxEVT_TREE_DELETE_ITEM + wxEVT_COMMAND_TREE_GET_INFO = wxEVT_TREE_GET_INFO + wxEVT_COMMAND_TREE_SET_INFO = wxEVT_TREE_SET_INFO + wxEVT_COMMAND_TREE_ITEM_EXPANDED = wxEVT_TREE_ITEM_EXPANDED + wxEVT_COMMAND_TREE_ITEM_EXPANDING = wxEVT_TREE_ITEM_EXPANDING + wxEVT_COMMAND_TREE_ITEM_COLLAPSED = wxEVT_TREE_ITEM_COLLAPSED + wxEVT_COMMAND_TREE_ITEM_COLLAPSING = wxEVT_TREE_ITEM_COLLAPSING + wxEVT_COMMAND_TREE_SEL_CHANGED = wxEVT_TREE_SEL_CHANGED + wxEVT_COMMAND_TREE_SEL_CHANGING = wxEVT_TREE_SEL_CHANGING + wxEVT_COMMAND_TREE_KEY_DOWN = wxEVT_TREE_KEY_DOWN + wxEVT_COMMAND_TREE_ITEM_ACTIVATED = wxEVT_TREE_ITEM_ACTIVATED + wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = wxEVT_TREE_ITEM_RIGHT_CLICK + wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = wxEVT_TREE_ITEM_MIDDLE_CLICK + wxEVT_COMMAND_TREE_END_DRAG = wxEVT_TREE_END_DRAG + wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = wxEVT_TREE_STATE_IMAGE_CLICK + wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP = wxEVT_TREE_ITEM_GETTOOLTIP + wxEVT_COMMAND_TREE_ITEM_MENU = wxEVT_TREE_ITEM_MENU """) #----------------------------------------------------------------- diff --git a/etg/treelist.py b/etg/treelist.py index 97142ccc..f2c1cbe5 100644 --- a/etg/treelist.py +++ b/etg/treelist.py @@ -112,13 +112,22 @@ def run(): tools.fixEventClass(c) c.addPyCode("""\ - EVT_TREELIST_SELECTION_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_SELECTION_CHANGED ) - EVT_TREELIST_ITEM_EXPANDING = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_ITEM_EXPANDING ) - EVT_TREELIST_ITEM_EXPANDED = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_ITEM_EXPANDED ) - EVT_TREELIST_ITEM_CHECKED = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_ITEM_CHECKED ) - EVT_TREELIST_ITEM_ACTIVATED = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED ) - EVT_TREELIST_ITEM_CONTEXT_MENU = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU ) - EVT_TREELIST_COLUMN_SORTED = wx.PyEventBinder( wxEVT_COMMAND_TREELIST_COLUMN_SORTED ) + EVT_TREELIST_SELECTION_CHANGED = wx.PyEventBinder( wxEVT_TREELIST_SELECTION_CHANGED ) + EVT_TREELIST_ITEM_EXPANDING = wx.PyEventBinder( wxEVT_TREELIST_ITEM_EXPANDING ) + EVT_TREELIST_ITEM_EXPANDED = wx.PyEventBinder( wxEVT_TREELIST_ITEM_EXPANDED ) + EVT_TREELIST_ITEM_CHECKED = wx.PyEventBinder( wxEVT_TREELIST_ITEM_CHECKED ) + EVT_TREELIST_ITEM_ACTIVATED = wx.PyEventBinder( wxEVT_TREELIST_ITEM_ACTIVATED ) + EVT_TREELIST_ITEM_CONTEXT_MENU = wx.PyEventBinder( wxEVT_TREELIST_ITEM_CONTEXT_MENU ) + EVT_TREELIST_COLUMN_SORTED = wx.PyEventBinder( wxEVT_TREELIST_COLUMN_SORTED ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_TREELIST_SELECTION_CHANGED = wxEVT_TREELIST_SELECTION_CHANGED + wxEVT_COMMAND_TREELIST_ITEM_EXPANDING = wxEVT_TREELIST_ITEM_EXPANDING + wxEVT_COMMAND_TREELIST_ITEM_EXPANDED = wxEVT_TREELIST_ITEM_EXPANDED + wxEVT_COMMAND_TREELIST_ITEM_CHECKED = wxEVT_TREELIST_ITEM_CHECKED + wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED = wxEVT_TREELIST_ITEM_ACTIVATED + wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU = wxEVT_TREELIST_ITEM_CONTEXT_MENU + wxEVT_COMMAND_TREELIST_COLUMN_SORTED = wxEVT_TREELIST_COLUMN_SORTED """) #----------------------------------------------------------------- diff --git a/etg/webview.py b/etg/webview.py index cbbe4cc2..ba47c621 100644 --- a/etg/webview.py +++ b/etg/webview.py @@ -110,16 +110,23 @@ def run(): tools.fixEventClass(c) module.addPyCode("""\ - EVT_WEBVIEW_NAVIGATING = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NAVIGATING, 1 ) - EVT_WEBVIEW_NAVIGATED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NAVIGATED, 1 ) - EVT_WEBVIEW_LOADED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_LOADED, 1 ) - EVT_WEBVIEW_ERROR = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_ERROR, 1 ) - EVT_WEBVIEW_NEWWINDOW = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_NEWWINDOW, 1 ) - EVT_WEBVIEW_TITLE_CHANGED = wx.PyEventBinder( wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED, 1 ) + EVT_WEBVIEW_NAVIGATING = wx.PyEventBinder( wxEVT_WEBVIEW_NAVIGATING, 1 ) + EVT_WEBVIEW_NAVIGATED = wx.PyEventBinder( wxEVT_WEBVIEW_NAVIGATED, 1 ) + EVT_WEBVIEW_LOADED = wx.PyEventBinder( wxEVT_WEBVIEW_LOADED, 1 ) + EVT_WEBVIEW_ERROR = wx.PyEventBinder( wxEVT_WEBVIEW_ERROR, 1 ) + EVT_WEBVIEW_NEWWINDOW = wx.PyEventBinder( wxEVT_WEBVIEW_NEWWINDOW, 1 ) + EVT_WEBVIEW_TITLE_CHANGED = wx.PyEventBinder( wxEVT_WEBVIEW_TITLE_CHANGED, 1 ) + + # deprecated wxEVT aliases + wxEVT_COMMAND_WEBVIEW_NAVIGATING = wxEVT_WEBVIEW_NAVIGATING + wxEVT_COMMAND_WEBVIEW_NAVIGATED = wxEVT_WEBVIEW_NAVIGATED + wxEVT_COMMAND_WEBVIEW_LOADED = wxEVT_WEBVIEW_LOADED + wxEVT_COMMAND_WEBVIEW_ERROR = wxEVT_WEBVIEW_ERROR + wxEVT_COMMAND_WEBVIEW_NEWWINDOW = wxEVT_WEBVIEW_NEWWINDOW + wxEVT_COMMAND_WEBVIEW_TITLE_CHANGED = wxEVT_WEBVIEW_TITLE_CHANGED """) - c = module.find('wxWebViewHistoryItem') tools.addAutoProperties(c) diff --git a/src/event_ex.py b/src/event_ex.py index 9713560c..c1402b35 100644 --- a/src/event_ex.py +++ b/src/event_ex.py @@ -152,29 +152,29 @@ EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1 EVT_COMMAND_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED, 1) EVT_COMMAND_SCROLL_ENDSCROLL = EVT_COMMAND_SCROLL_CHANGED -EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1) -EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1) -EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1) -EVT_LISTBOX = wx.PyEventBinder( wxEVT_COMMAND_LISTBOX_SELECTED, 1) -EVT_LISTBOX_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 1) -EVT_MENU = wx.PyEventBinder( wxEVT_COMMAND_MENU_SELECTED, 1) -EVT_MENU_RANGE = wx.PyEventBinder( wxEVT_COMMAND_MENU_SELECTED, 2) -EVT_SLIDER = wx.PyEventBinder( wxEVT_COMMAND_SLIDER_UPDATED, 1) -EVT_RADIOBOX = wx.PyEventBinder( wxEVT_COMMAND_RADIOBOX_SELECTED, 1) -EVT_RADIOBUTTON = wx.PyEventBinder( wxEVT_COMMAND_RADIOBUTTON_SELECTED, 1) +EVT_BUTTON = wx.PyEventBinder( wxEVT_BUTTON, 1) +EVT_CHECKBOX = wx.PyEventBinder( wxEVT_CHECKBOX, 1) +EVT_CHOICE = wx.PyEventBinder( wxEVT_CHOICE, 1) +EVT_LISTBOX = wx.PyEventBinder( wxEVT_LISTBOX, 1) +EVT_LISTBOX_DCLICK = wx.PyEventBinder( wxEVT_LISTBOX_DCLICK, 1) +EVT_MENU = wx.PyEventBinder( wxEVT_MENU, 1) +EVT_MENU_RANGE = wx.PyEventBinder( wxEVT_MENU, 2) +EVT_SLIDER = wx.PyEventBinder( wxEVT_SLIDER, 1) +EVT_RADIOBOX = wx.PyEventBinder( wxEVT_RADIOBOX, 1) +EVT_RADIOBUTTON = wx.PyEventBinder( wxEVT_RADIOBUTTON, 1) -EVT_SCROLLBAR = wx.PyEventBinder( wxEVT_COMMAND_SCROLLBAR_UPDATED, 1) -EVT_VLBOX = wx.PyEventBinder( wxEVT_COMMAND_VLBOX_SELECTED, 1) -EVT_COMBOBOX = wx.PyEventBinder( wxEVT_COMMAND_COMBOBOX_SELECTED, 1) -EVT_TOOL = wx.PyEventBinder( wxEVT_COMMAND_TOOL_CLICKED, 1) -EVT_TOOL_RANGE = wx.PyEventBinder( wxEVT_COMMAND_TOOL_CLICKED, 2) -EVT_TOOL_RCLICKED = wx.PyEventBinder( wxEVT_COMMAND_TOOL_RCLICKED, 1) -EVT_TOOL_RCLICKED_RANGE = wx.PyEventBinder( wxEVT_COMMAND_TOOL_RCLICKED, 2) -EVT_TOOL_ENTER = wx.PyEventBinder( wxEVT_COMMAND_TOOL_ENTER, 1) -EVT_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, 1) -EVT_CHECKLISTBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, 1) -EVT_COMBOBOX_DROPDOWN = wx.PyEventBinder( wxEVT_COMMAND_COMBOBOX_DROPDOWN , 1) -EVT_COMBOBOX_CLOSEUP = wx.PyEventBinder( wxEVT_COMMAND_COMBOBOX_CLOSEUP , 1) +EVT_SCROLLBAR = wx.PyEventBinder( wxEVT_SCROLLBAR, 1) +EVT_VLBOX = wx.PyEventBinder( wxEVT_VLBOX, 1) +EVT_COMBOBOX = wx.PyEventBinder( wxEVT_COMBOBOX, 1) +EVT_TOOL = wx.PyEventBinder( wxEVT_TOOL, 1) +EVT_TOOL_RANGE = wx.PyEventBinder( wxEVT_TOOL, 2) +EVT_TOOL_RCLICKED = wx.PyEventBinder( wxEVT_TOOL_RCLICKED, 1) +EVT_TOOL_RCLICKED_RANGE = wx.PyEventBinder( wxEVT_TOOL_RCLICKED, 2) +EVT_TOOL_ENTER = wx.PyEventBinder( wxEVT_TOOL_ENTER, 1) +EVT_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_TOOL_DROPDOWN, 1) +EVT_CHECKLISTBOX = wx.PyEventBinder( wxEVT_CHECKLISTBOX, 1) +EVT_COMBOBOX_DROPDOWN = wx.PyEventBinder( wxEVT_COMBOBOX_DROPDOWN , 1) +EVT_COMBOBOX_CLOSEUP = wx.PyEventBinder( wxEVT_COMBOBOX_CLOSEUP , 1) EVT_COMMAND_LEFT_CLICK = wx.PyEventBinder( wxEVT_COMMAND_LEFT_CLICK, 1) EVT_COMMAND_LEFT_DCLICK = wx.PyEventBinder( wxEVT_COMMAND_LEFT_DCLICK, 1) @@ -209,3 +209,28 @@ EVT_JOYSTICK_EVENTS = wx.PyEventBinder([ wxEVT_JOY_BUTTON_DOWN, wxEVT_JOY_MOVE, wxEVT_JOY_ZMOVE, ]) + +# deprecated wxEVT aliases +wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_BUTTON +wxEVT_COMMAND_CHECKBOX_CLICKED = wxEVT_CHECKBOX +wxEVT_COMMAND_CHOICE_SELECTED = wxEVT_CHOICE +wxEVT_COMMAND_LISTBOX_SELECTED = wxEVT_LISTBOX +wxEVT_COMMAND_LISTBOX_DOUBLECLICKED = wxEVT_LISTBOX_DCLICK +wxEVT_COMMAND_CHECKLISTBOX_TOGGLED = wxEVT_CHECKLISTBOX +wxEVT_COMMAND_MENU_SELECTED = wxEVT_MENU +wxEVT_COMMAND_TOOL_CLICKED = wxEVT_TOOL +wxEVT_COMMAND_SLIDER_UPDATED = wxEVT_SLIDER +wxEVT_COMMAND_RADIOBOX_SELECTED = wxEVT_RADIOBOX +wxEVT_COMMAND_RADIOBUTTON_SELECTED = wxEVT_RADIOBUTTON +wxEVT_COMMAND_SCROLLBAR_UPDATED = wxEVT_SCROLLBAR +wxEVT_COMMAND_VLBOX_SELECTED = wxEVT_VLBOX +wxEVT_COMMAND_COMBOBOX_SELECTED = wxEVT_COMBOBOX +wxEVT_COMMAND_TOOL_RCLICKED = wxEVT_TOOL_RCLICKED +wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED = wxEVT_TOOL_DROPDOWN +wxEVT_COMMAND_TOOL_ENTER = wxEVT_TOOL_ENTER +wxEVT_COMMAND_COMBOBOX_DROPDOWN = wxEVT_COMBOBOX_DROPDOWN +wxEVT_COMMAND_COMBOBOX_CLOSEUP = wxEVT_COMBOBOX_CLOSEUP +wxEVT_COMMAND_TEXT_COPY = wxEVT_TEXT_COPY +wxEVT_COMMAND_TEXT_CUT = wxEVT_TEXT_CUT +wxEVT_COMMAND_TEXT_PASTE = wxEVT_TEXT_PASTE +wxEVT_COMMAND_TEXT_UPDATED = wxEVT_TEXT \ No newline at end of file