Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'more-windowidref' into wxPy-4.0.x

Browse Source 
(cherry picked from commit ada7b2fc51)
This commit is contained in:
Robin Dunn
2018-06-25 19:10:56 -07:00
parent 28bdb22c89
commit 705aa63d75
58 changed files with 337 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
wx/py/frame.py
View File

@@ -23,42 +23,42 @@ ID_COPY = wx.ID_COPY
ID_PASTE = wx.ID_PASTE
ID_CLEAR = wx.ID_CLEAR
ID_SELECTALL = wx.ID_SELECTALL
ID_EMPTYBUFFER = wx.Window.NewControlId()
ID_EMPTYBUFFER = wx.NewIdRef()
ID_ABOUT = wx.ID_ABOUT
ID_HELP = wx.Window.NewControlId()
ID_AUTOCOMP = wx.Window.NewControlId()
ID_AUTOCOMP_SHOW = wx.Window.NewControlId()
ID_AUTOCOMP_MAGIC = wx.Window.NewControlId()
ID_AUTOCOMP_SINGLE = wx.Window.NewControlId()
ID_AUTOCOMP_DOUBLE = wx.Window.NewControlId()
ID_CALLTIPS = wx.Window.NewControlId()
ID_CALLTIPS_SHOW = wx.Window.NewControlId()
ID_CALLTIPS_INSERT = wx.Window.NewControlId()
ID_COPY_PLUS = wx.Window.NewControlId()
ID_NAMESPACE = wx.Window.NewControlId()
ID_PASTE_PLUS = wx.Window.NewControlId()
ID_WRAP = wx.Window.NewControlId()
ID_TOGGLE_MAXIMIZE = wx.Window.NewControlId()
ID_SHOW_LINENUMBERS = wx.Window.NewControlId()
ID_ENABLESHELLMODE = wx.Window.NewControlId()
ID_ENABLEAUTOSYMPY = wx.Window.NewControlId()
ID_AUTO_SAVESETTINGS = wx.Window.NewControlId()
ID_SAVEACOPY = wx.Window.NewControlId()
ID_SAVEHISTORY = wx.Window.NewControlId()
ID_SAVEHISTORYNOW = wx.Window.NewControlId()
ID_CLEARHISTORY = wx.Window.NewControlId()
ID_SAVESETTINGS = wx.Window.NewControlId()
ID_DELSETTINGSFILE = wx.Window.NewControlId()
ID_EDITSTARTUPSCRIPT = wx.Window.NewControlId()
ID_EXECSTARTUPSCRIPT = wx.Window.NewControlId()
ID_SHOWPYSLICESTUTORIAL = wx.Window.NewControlId()
ID_STARTUP = wx.Window.NewControlId()
ID_SETTINGS = wx.Window.NewControlId()
ID_HELP = wx.NewIdRef()
ID_AUTOCOMP = wx.NewIdRef()
ID_AUTOCOMP_SHOW = wx.NewIdRef()
ID_AUTOCOMP_MAGIC = wx.NewIdRef()
ID_AUTOCOMP_SINGLE = wx.NewIdRef()
ID_AUTOCOMP_DOUBLE = wx.NewIdRef()
ID_CALLTIPS = wx.NewIdRef()
ID_CALLTIPS_SHOW = wx.NewIdRef()
ID_CALLTIPS_INSERT = wx.NewIdRef()
ID_COPY_PLUS = wx.NewIdRef()
ID_NAMESPACE = wx.NewIdRef()
ID_PASTE_PLUS = wx.NewIdRef()
ID_WRAP = wx.NewIdRef()
ID_TOGGLE_MAXIMIZE = wx.NewIdRef()
ID_SHOW_LINENUMBERS = wx.NewIdRef()
ID_ENABLESHELLMODE = wx.NewIdRef()
ID_ENABLEAUTOSYMPY = wx.NewIdRef()
ID_AUTO_SAVESETTINGS = wx.NewIdRef()
ID_SAVEACOPY = wx.NewIdRef()
ID_SAVEHISTORY = wx.NewIdRef()
ID_SAVEHISTORYNOW = wx.NewIdRef()
ID_CLEARHISTORY = wx.NewIdRef()
ID_SAVESETTINGS = wx.NewIdRef()
ID_DELSETTINGSFILE = wx.NewIdRef()
ID_EDITSTARTUPSCRIPT = wx.NewIdRef()
ID_EXECSTARTUPSCRIPT = wx.NewIdRef()
ID_SHOWPYSLICESTUTORIAL = wx.NewIdRef()
ID_STARTUP = wx.NewIdRef()
ID_SETTINGS = wx.NewIdRef()
ID_FIND = wx.ID_FIND
ID_FINDNEXT = wx.Window.NewControlId()
ID_FINDPREVIOUS = wx.Window.NewControlId()
ID_SHOWTOOLS = wx.Window.NewControlId()
ID_HIDEFOLDINGMARGIN = wx.Window.NewControlId()
ID_FINDNEXT = wx.NewIdRef()
ID_FINDPREVIOUS = wx.NewIdRef()
ID_SHOWTOOLS = wx.NewIdRef()
ID_HIDEFOLDINGMARGIN = wx.NewIdRef()

14
wx/py/shell.py
View File

@@ -318,13 +318,13 @@ class Shell(editwindow.EditWindow):
self.ID_UNDO = wx.ID_UNDO
self.ID_REDO = wx.ID_REDO
else:
self.ID_CUT = wx.Window.NewControlId()
self.ID_COPY = wx.Window.NewControlId()
self.ID_PASTE = wx.Window.NewControlId()
self.ID_SELECTALL = wx.Window.NewControlId()
self.ID_CLEAR = wx.Window.NewControlId()
self.ID_UNDO = wx.Window.NewControlId()
self.ID_REDO = wx.Window.NewControlId()
self.ID_CUT = wx.NewIdRef()
self.ID_COPY = wx.NewIdRef()
self.ID_PASTE = wx.NewIdRef()
self.ID_SELECTALL = wx.NewIdRef()
self.ID_CLEAR = wx.NewIdRef()
self.ID_UNDO = wx.NewIdRef()
self.ID_REDO = wx.NewIdRef()
# Assign handlers for edit events
self.Bind(wx.EVT_MENU, lambda evt: self.Cut(), id=self.ID_CUT)

14
wx/py/sliceshell.py
View File

@@ -813,13 +813,13 @@ class SlicesShell(editwindow.EditWindow):
self.ID_UNDO = wx.ID_UNDO
self.ID_REDO = wx.ID_REDO
else:
self.ID_CUT = wx.Window.NewControlId()
self.ID_COPY = wx.Window.NewControlId()
self.ID_PASTE = wx.Window.NewControlId()
self.ID_SELECTALL = wx.Window.NewControlId()
self.ID_CLEAR = wx.Window.NewControlId()
self.ID_UNDO = wx.Window.NewControlId()
self.ID_REDO = wx.Window.NewControlId()
self.ID_CUT = wx.NewIdRef()
self.ID_COPY = wx.NewIdRef()
self.ID_PASTE = wx.NewIdRef()
self.ID_SELECTALL = wx.NewIdRef()
self.ID_CLEAR = wx.NewIdRef()
self.ID_UNDO = wx.NewIdRef()
self.ID_REDO = wx.NewIdRef()
# Assign handlers for edit events
self.Bind(wx.EVT_MENU, lambda evt: self.Cut(), id=self.ID_CUT)