From 705aa63d75715f8abe484f4559a37cb6b09decb3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 25 Jun 2018 19:10:56 -0700 Subject: [PATCH] Merge branch 'more-windowidref' into wxPy-4.0.x (cherry picked from commit ada7b2fc516df8d73c7e03675dfad8c028664bd3) --- demo/AUI_DockingWindowMgr.py | 52 +++++++-------- demo/Calendar.py | 16 ++--- demo/DragAndDrop.py | 6 +- demo/GLCanvas.py | 4 +- demo/Grid_MegaExample.py | 8 +-- demo/I18N.py | 2 +- demo/InfoBar.py | 2 +- demo/LayoutAnchors.py | 4 +- demo/ListCtrl.py | 14 ++-- demo/ListCtrl_edit.py | 2 +- demo/MDIDemo.py | 4 +- demo/Main.py | 8 +-- demo/Menu.py | 2 +- demo/MouseGestures.py | 8 +-- demo/PopupMenu.py | 18 +++--- demo/PseudoDC.py | 2 +- demo/ToolBar.py | 2 +- demo/TreeCtrl.py | 2 +- demo/agw/AGWInfoBar.py | 2 +- demo/agw/BalloonTip.py | 4 +- demo/agw/ButtonPanel.py | 18 +++--- demo/agw/FlatMenu.py | 22 +++---- demo/agw/FlatNotebook.py | 86 ++++++++++++------------- demo/agw/FoldPanelBar.py | 36 +++++------ demo/agw/HyperLinkCtrl.py | 4 +- demo/agw/HyperTreeList.py | 4 +- demo/agw/ShapedButton.py | 4 +- demo/agw/ShortcutEditor.py | 2 +- demo/agw/ThumbnailCtrl.py | 34 +++++----- demo/agw/UltimateReportDemo.py | 12 ++-- demo/infoframe.py | 4 +- etg/windowid.py | 10 ++- samples/floatcanvas/MovingPlot.py | 4 +- samples/floatcanvas/PolyEditor.py | 2 +- unittests/test_windowid.py | 22 +++++++ wx/lib/activex.py | 2 +- wx/lib/agw/aui/auibar.py | 4 +- wx/lib/agw/buttonpanel.py | 4 +- wx/lib/agw/flatmenu.py | 12 ++-- wx/lib/agw/fmcustomizedlg.py | 12 ++-- wx/lib/agw/pygauge.py | 2 +- wx/lib/agw/rulerctrl.py | 2 +- wx/lib/agw/toasterbox.py | 2 +- wx/lib/analogclock/analogclock.py | 4 +- wx/lib/colourchooser/pycolourchooser.py | 8 +-- wx/lib/filebrowsebutton.py | 4 +- wx/lib/foldmenu.py | 2 +- wx/lib/imagebrowser.py | 14 ++-- wx/lib/masked/maskededit.py | 4 +- wx/lib/newevent.py | 8 +-- wx/lib/ogl/basic.py | 2 +- wx/lib/ogl/composit.py | 4 +- wx/lib/ogl/lines.py | 2 +- wx/lib/pydocview.py | 28 ++++---- wx/lib/throbber.py | 2 +- wx/py/frame.py | 68 +++++++++---------- wx/py/shell.py | 14 ++-- wx/py/sliceshell.py | 14 ++-- 58 files changed, 337 insertions(+), 307 deletions(-) diff --git a/demo/AUI_DockingWindowMgr.py b/demo/AUI_DockingWindowMgr.py index 28aa3084..1e53c753 100644 --- a/demo/AUI_DockingWindowMgr.py +++ b/demo/AUI_DockingWindowMgr.py @@ -7,34 +7,34 @@ import wx.aui as aui from six import BytesIO -ID_CreateTree = wx.Window.NewControlId() -ID_CreateGrid = wx.Window.NewControlId() -ID_CreateText = wx.Window.NewControlId() -ID_CreateHTML = wx.Window.NewControlId() -ID_CreateSizeReport = wx.Window.NewControlId() -ID_GridContent = wx.Window.NewControlId() -ID_TextContent = wx.Window.NewControlId() -ID_TreeContent = wx.Window.NewControlId() -ID_HTMLContent = wx.Window.NewControlId() -ID_SizeReportContent = wx.Window.NewControlId() -ID_CreatePerspective = wx.Window.NewControlId() -ID_CopyPerspective = wx.Window.NewControlId() +ID_CreateTree = wx.NewIdRef() +ID_CreateGrid = wx.NewIdRef() +ID_CreateText = wx.NewIdRef() +ID_CreateHTML = wx.NewIdRef() +ID_CreateSizeReport = wx.NewIdRef() +ID_GridContent = wx.NewIdRef() +ID_TextContent = wx.NewIdRef() +ID_TreeContent = wx.NewIdRef() +ID_HTMLContent = wx.NewIdRef() +ID_SizeReportContent = wx.NewIdRef() +ID_CreatePerspective = wx.NewIdRef() +ID_CopyPerspective = wx.NewIdRef() -ID_TransparentHint = wx.Window.NewControlId() -ID_VenetianBlindsHint = wx.Window.NewControlId() -ID_RectangleHint = wx.Window.NewControlId() -ID_NoHint = wx.Window.NewControlId() -ID_HintFade = wx.Window.NewControlId() -ID_AllowFloating = wx.Window.NewControlId() -ID_NoVenetianFade = wx.Window.NewControlId() -ID_TransparentDrag = wx.Window.NewControlId() -ID_AllowActivePane = wx.Window.NewControlId() -ID_NoGradient = wx.Window.NewControlId() -ID_VerticalGradient = wx.Window.NewControlId() -ID_HorizontalGradient = wx.Window.NewControlId() +ID_TransparentHint = wx.NewIdRef() +ID_VenetianBlindsHint = wx.NewIdRef() +ID_RectangleHint = wx.NewIdRef() +ID_NoHint = wx.NewIdRef() +ID_HintFade = wx.NewIdRef() +ID_AllowFloating = wx.NewIdRef() +ID_NoVenetianFade = wx.NewIdRef() +ID_TransparentDrag = wx.NewIdRef() +ID_AllowActivePane = wx.NewIdRef() +ID_NoGradient = wx.NewIdRef() +ID_VerticalGradient = wx.NewIdRef() +ID_HorizontalGradient = wx.NewIdRef() -ID_Settings = wx.Window.NewControlId() -ID_About = wx.Window.NewControlId() +ID_Settings = wx.NewIdRef() +ID_About = wx.NewIdRef() ID_FirstPerspective = ID_CreatePerspective+1000 diff --git a/demo/Calendar.py b/demo/Calendar.py index e1081687..b9d702d2 100644 --- a/demo/Calendar.py +++ b/demo/Calendar.py @@ -309,17 +309,17 @@ class CalendFrame(wx.Frame): def MakeFileMenu(self): menu = wx.Menu() - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() menu.Append(mID, 'Decrement', 'Next') self.Bind(wx.EVT_MENU, self.OnDecMonth, id=mID) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() menu.Append(mID, 'Increment', 'Dec') self.Bind(wx.EVT_MENU, self.OnIncMonth, id=mID) menu.AppendSeparator() - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() menu.Append(mID, 'E&xit', 'Exit') self.Bind(wx.EVT_MENU, self.OnCloseWindow, id=mID) @@ -328,23 +328,23 @@ class CalendFrame(wx.Frame): def MakeToolMenu(self): tb = self.CreateToolBar(wx.TB_HORIZONTAL|wx.NO_BORDER) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() SetToolPath(self, tb, mID, images.DbDec.GetBitmap(), 'Dec Year') self.Bind(wx.EVT_TOOL, self.OnDecYear, id=mID) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() SetToolPath(self, tb, mID, images.Dec.GetBitmap(), 'Dec Month') self.Bind(wx.EVT_TOOL, self.OnDecMonth, id=mID) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() SetToolPath(self, tb, mID, images.Pt.GetBitmap(), 'Current Month') self.Bind(wx.EVT_TOOL, self.OnCurrent, id=mID) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() SetToolPath(self, tb, mID, images.Inc.GetBitmap(), 'Inc Month') self.Bind(wx.EVT_TOOL, self.OnIncMonth, id=mID) - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() SetToolPath(self, tb, mID, images.DbInc.GetBitmap(), 'Inc Year') self.Bind(wx.EVT_TOOL, self.OnIncYear, id=mID) diff --git a/demo/DragAndDrop.py b/demo/DragAndDrop.py index ccc6eeef..58ee5d5a 100644 --- a/demo/DragAndDrop.py +++ b/demo/DragAndDrop.py @@ -4,9 +4,9 @@ import wx #---------------------------------------------------------------------- -ID_CopyBtn = wx.Window.NewControlId() -ID_PasteBtn = wx.Window.NewControlId() -ID_BitmapBtn = wx.Window.NewControlId() +ID_CopyBtn = wx.NewIdRef() +ID_PasteBtn = wx.NewIdRef() +ID_BitmapBtn = wx.NewIdRef() #---------------------------------------------------------------------- diff --git a/demo/GLCanvas.py b/demo/GLCanvas.py index bb1b8991..87a217a6 100644 --- a/demo/GLCanvas.py +++ b/demo/GLCanvas.py @@ -22,8 +22,8 @@ except ImportError: buttonDefs = { - wx.Window.NewControlId() : ('CubeCanvas', 'Cube'), - wx.Window.NewControlId() : ('ConeCanvas', 'Cone'), + wx.NewIdRef() : ('CubeCanvas', 'Cube'), + wx.NewIdRef() : ('ConeCanvas', 'Cone'), } class ButtonPanel(wx.Panel): diff --git a/demo/Grid_MegaExample.py b/demo/Grid_MegaExample.py index 8495e046..f37629d8 100644 --- a/demo/Grid_MegaExample.py +++ b/demo/Grid_MegaExample.py @@ -332,8 +332,8 @@ class MegaGrid(Grid.Grid): def rowPopup(self, row, evt): """(row, evt) -> display a popup menu when a row label is right clicked""" - appendID = wx.Window.NewControlId() - deleteID = wx.Window.NewControlId() + appendID = wx.NewIdRef() + deleteID = wx.NewIdRef() x = self.GetRowSize(row)/2 if not self.GetSelectedRows(): @@ -365,8 +365,8 @@ class MegaGrid(Grid.Grid): right clicked""" x = self.GetColSize(col)/2 menu = wx.Menu() - id1 = wx.Window.NewControlId() - sortID = wx.Window.NewControlId() + id1 = wx.NewIdRef() + sortID = wx.NewIdRef() xo, yo = evt.GetPosition() self.SelectCol(col) diff --git a/demo/I18N.py b/demo/I18N.py index 72e8214c..456b7d33 100644 --- a/demo/I18N.py +++ b/demo/I18N.py @@ -32,7 +32,7 @@ exampleStrings = [ wxID_LANGUAGESELECTPANELLANGFILTERRB, wxID_LANGUAGESELECTPANELSTATICLINE1, wxID_LANGUAGESELECTPANELSTATICTEXT1, wxID_LANGUAGESELECTPANELSTATICTEXT2, wxID_LANGUAGESELECTPANELSTATICTEXT3, wxID_LANGUAGESELECTPANELTRANSLATEDST, -] = [wx.Window.NewControlId() for _init_ctrls in range(9)] +] = wx.NewIdRef(9) class LanguageSelectPanel(wx.Panel): def _init_coll_boxSizer3_Items(self, parent): diff --git a/demo/InfoBar.py b/demo/InfoBar.py index 23133cd7..c197d166 100644 --- a/demo/InfoBar.py +++ b/demo/InfoBar.py @@ -72,7 +72,7 @@ to display non-critical information to the user.""" def OnAddButton(self, evt): - btnId = wx.Window.NewControlId() + btnId = wx.NewIdRef() self.info.AddButton(btnId, "new button") self.info.Bind(wx.EVT_BUTTON, self.OnButtonClicked, id=btnId) diff --git a/demo/LayoutAnchors.py b/demo/LayoutAnchors.py index 51f1ba41..65d4c315 100644 --- a/demo/LayoutAnchors.py +++ b/demo/LayoutAnchors.py @@ -5,7 +5,7 @@ import wx.lib.anchors as anchors #---------------------------------------------------------------------- -# Nifty little trick here; apply wx.Window.NewControlId() to generate a series of +# Nifty little trick here; apply wx.NewIdRef() to generate a series of # IDs used later on in the app. [ ID_ANCHORSDEMOFRAMEANCHOREDPANEL, @@ -18,7 +18,7 @@ import wx.lib.anchors as anchors ID_ANCHORSDEMOFRAMEBOTTOMCHECKBOX, ID_ANCHORSDEMOFRAME, ID_ANCHORSDEMOFRAMELEFTCHECKBOX, - ] = map(lambda _init_ctrls: wx.Window.NewControlId(), range(10)) + ] = wx.NewIdRef(10) # A small note here: while only certain parts of this frame are actually demonstrating # the capabilities of the LayoutAnchors feature, all the controls are within the same diff --git a/demo/ListCtrl.py b/demo/ListCtrl.py index ea3d74db..0d5636f8 100644 --- a/demo/ListCtrl.py +++ b/demo/ListCtrl.py @@ -90,7 +90,7 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin): wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS) self.log = log - tID = wx.Window.NewControlId() + tID = wx.NewIdRef() sizer = wx.BoxSizer(wx.VERTICAL) @@ -304,12 +304,12 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin): # only do this part the first time so the events are only bound once if not hasattr(self, "popupID1"): - self.popupID1 = wx.Window.NewControlId() - self.popupID2 = wx.Window.NewControlId() - self.popupID3 = wx.Window.NewControlId() - self.popupID4 = wx.Window.NewControlId() - self.popupID5 = wx.Window.NewControlId() - self.popupID6 = wx.Window.NewControlId() + self.popupID1 = wx.NewIdRef() + self.popupID2 = wx.NewIdRef() + self.popupID3 = wx.NewIdRef() + self.popupID4 = wx.NewIdRef() + self.popupID5 = wx.NewIdRef() + self.popupID6 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1) self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2) diff --git a/demo/ListCtrl_edit.py b/demo/ListCtrl_edit.py index 7f59c0db..77341dbe 100644 --- a/demo/ListCtrl_edit.py +++ b/demo/ListCtrl_edit.py @@ -86,7 +86,7 @@ class TestListCtrlPanel(wx.Panel): wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS) self.log = log - tID = wx.Window.NewControlId() + tID = wx.NewIdRef() sizer = wx.BoxSizer(wx.VERTICAL) diff --git a/demo/MDIDemo.py b/demo/MDIDemo.py index 6dc44794..e4ddf489 100644 --- a/demo/MDIDemo.py +++ b/demo/MDIDemo.py @@ -10,8 +10,8 @@ import images SHOW_BACKGROUND = 1 #---------------------------------------------------------------------- -ID_New = wx.Window.NewControlId() -ID_Exit = wx.Window.NewControlId() +ID_New = wx.NewIdRef() +ID_Exit = wx.NewIdRef() #---------------------------------------------------------------------- class MyParentFrame(wx.MDIParentFrame): diff --git a/demo/Main.py b/demo/Main.py index c31060f4..00fcffb8 100644 --- a/demo/Main.py +++ b/demo/Main.py @@ -1306,10 +1306,10 @@ class MainPanel(wx.Panel): #--------------------------------------------------------------------------- class DemoTaskBarIcon(TaskBarIcon): - TBMENU_RESTORE = wx.Window.NewControlId() - TBMENU_CLOSE = wx.Window.NewControlId() - TBMENU_CHANGE = wx.Window.NewControlId() - TBMENU_REMOVE = wx.Window.NewControlId() + TBMENU_RESTORE = wx.NewIdRef() + TBMENU_CLOSE = wx.NewIdRef() + TBMENU_CHANGE = wx.NewIdRef() + TBMENU_REMOVE = wx.NewIdRef() def __init__(self, frame): TaskBarIcon.__init__(self, wx.adv.TBI_DOCK) # wx.adv.TBI_CUSTOM_STATUSITEM diff --git a/demo/Menu.py b/demo/Menu.py index 7558631c..4629d561 100644 --- a/demo/Menu.py +++ b/demo/Menu.py @@ -245,7 +245,7 @@ check the source for this sample to see how to implement them. pos += 1 # now insert the new item - ID = wx.Window.NewControlId() + ID = wx.NewIdRef() item = wx.MenuItem(menu, ID, "NewItem " + str(ID)) menu.InsertItem(pos, item) diff --git a/demo/MouseGestures.py b/demo/MouseGestures.py index f86a9556..a846c97d 100644 --- a/demo/MouseGestures.py +++ b/demo/MouseGestures.py @@ -25,10 +25,10 @@ class TestPanel(wx.Panel): def __init__(self, parent, log): wx.Panel.__init__(self, parent, -1) - ID_GESTURE = wx.Window.NewControlId() - ID_MOUSE = wx.Window.NewControlId() - ID_MODIFIER = wx.Window.NewControlId() - ID_VISIBLE = wx.Window.NewControlId() + ID_GESTURE = wx.NewIdRef() + ID_MOUSE = wx.NewIdRef() + ID_MODIFIER = wx.NewIdRef() + ID_VISIBLE = wx.NewIdRef() self.log = log diff --git a/demo/PopupMenu.py b/demo/PopupMenu.py index be6eb701..ab1f4548 100644 --- a/demo/PopupMenu.py +++ b/demo/PopupMenu.py @@ -56,15 +56,15 @@ class TestPanel(wx.Panel): # avoid clutter, some prefer them close to the object of interest # for clarity. if not hasattr(self, "popupID1"): - self.popupID1 = wx.Window.NewControlId() - self.popupID2 = wx.Window.NewControlId() - self.popupID3 = wx.Window.NewControlId() - self.popupID4 = wx.Window.NewControlId() - self.popupID5 = wx.Window.NewControlId() - self.popupID6 = wx.Window.NewControlId() - self.popupID7 = wx.Window.NewControlId() - self.popupID8 = wx.Window.NewControlId() - self.popupID9 = wx.Window.NewControlId() + self.popupID1 = wx.NewIdRef() + self.popupID2 = wx.NewIdRef() + self.popupID3 = wx.NewIdRef() + self.popupID4 = wx.NewIdRef() + self.popupID5 = wx.NewIdRef() + self.popupID6 = wx.NewIdRef() + self.popupID7 = wx.NewIdRef() + self.popupID8 = wx.NewIdRef() + self.popupID9 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1) self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2) diff --git a/demo/PseudoDC.py b/demo/PseudoDC.py index 1c4aed4b..4a888cd8 100644 --- a/demo/PseudoDC.py +++ b/demo/PseudoDC.py @@ -173,7 +173,7 @@ class MyCanvas(wx.ScrolledWindow): self.objids = [] self.boundsdict = {} for i in range(SHAPE_COUNT): - id = wx.Window.NewControlId() + id = wx.NewIdRef() dc.SetId(id) choice = random.randint(0,8) if choice in (0,1): diff --git a/demo/ToolBar.py b/demo/ToolBar.py index 4c6426e2..5400bd6d 100644 --- a/demo/ToolBar.py +++ b/demo/ToolBar.py @@ -123,7 +123,7 @@ class TestToolBar(wx.Frame): self.Bind(wx.EVT_TIMER, self.OnClearSB) tb.AddSeparator() - cbID = wx.Window.NewControlId() + cbID = wx.NewIdRef() tb.AddControl( wx.ComboBox( diff --git a/demo/TreeCtrl.py b/demo/TreeCtrl.py index ea6644d5..fcd64bf3 100644 --- a/demo/TreeCtrl.py +++ b/demo/TreeCtrl.py @@ -28,7 +28,7 @@ class TestTreeCtrlPanel(wx.Panel): self.Bind(wx.EVT_SIZE, self.OnSize) self.log = log - tID = wx.Window.NewControlId() + tID = wx.NewIdRef() self.tree = MyTreeCtrl(self, tID, wx.DefaultPosition, wx.DefaultSize, wx.TR_HAS_BUTTONS diff --git a/demo/agw/AGWInfoBar.py b/demo/agw/AGWInfoBar.py index 26c53f80..25c66d0f 100644 --- a/demo/agw/AGWInfoBar.py +++ b/demo/agw/AGWInfoBar.py @@ -115,7 +115,7 @@ to display non-critical information to the user.""" def OnAddButton(self, event): - btnId = wx.Window.NewControlId() + btnId = wx.NewIdRef() if self.checkBitmap.GetValue(): bitmap = random.choice(self.valid_images) diff --git a/demo/agw/BalloonTip.py b/demo/agw/BalloonTip.py index 38d5c94e..991d0554 100644 --- a/demo/agw/BalloonTip.py +++ b/demo/agw/BalloonTip.py @@ -286,8 +286,8 @@ class BalloonTipDemo(wx.Frame): file_menu = wx.Menu() help_menu = wx.Menu() - TEST_QUIT = wx.Window.NewControlId() - TEST_ABOUT = wx.Window.NewControlId() + TEST_QUIT = wx.NewIdRef() + TEST_ABOUT = wx.NewIdRef() file_menu.Append(TEST_QUIT, "&Exit") help_menu.Append(TEST_ABOUT, "&About") diff --git a/demo/agw/ButtonPanel.py b/demo/agw/ButtonPanel.py index 349dd28f..7a88b856 100644 --- a/demo/agw/ButtonPanel.py +++ b/demo/agw/ButtonPanel.py @@ -21,15 +21,15 @@ import random #---------------------------------------------------------------------- -ID_BackgroundColour = wx.Window.NewControlId() -ID_GradientFrom = wx.Window.NewControlId() -ID_GradientTo = wx.Window.NewControlId() -ID_BorderColour = wx.Window.NewControlId() -ID_CaptionColour = wx.Window.NewControlId() -ID_ButtonTextColour = wx.Window.NewControlId() -ID_SelectionBrush = wx.Window.NewControlId() -ID_SelectionPen = wx.Window.NewControlId() -ID_SeparatorColour = wx.Window.NewControlId() +ID_BackgroundColour = wx.NewIdRef() +ID_GradientFrom = wx.NewIdRef() +ID_GradientTo = wx.NewIdRef() +ID_BorderColour = wx.NewIdRef() +ID_CaptionColour = wx.NewIdRef() +ID_ButtonTextColour = wx.NewIdRef() +ID_SelectionBrush = wx.NewIdRef() +ID_SelectionPen = wx.NewIdRef() +ID_SeparatorColour = wx.NewIdRef() #---------------------------------------------------------------------- diff --git a/demo/agw/FlatMenu.py b/demo/agw/FlatMenu.py index a7248d98..529fc1e1 100644 --- a/demo/agw/FlatMenu.py +++ b/demo/agw/FlatMenu.py @@ -48,18 +48,18 @@ else: # Menu items IDs #------------------------------- -MENU_STYLE_DEFAULT = wx.Window.NewControlId() -MENU_STYLE_XP = wx.Window.NewControlId() -MENU_STYLE_2007 = wx.Window.NewControlId() -MENU_STYLE_VISTA = wx.Window.NewControlId() -MENU_STYLE_MY = wx.Window.NewControlId() -MENU_USE_CUSTOM = wx.Window.NewControlId() -MENU_LCD_MONITOR = wx.Window.NewControlId() -MENU_HELP = wx.Window.NewControlId() +MENU_STYLE_DEFAULT = wx.NewIdRef() +MENU_STYLE_XP = wx.NewIdRef() +MENU_STYLE_2007 = wx.NewIdRef() +MENU_STYLE_VISTA = wx.NewIdRef() +MENU_STYLE_MY = wx.NewIdRef() +MENU_USE_CUSTOM = wx.NewIdRef() +MENU_LCD_MONITOR = wx.NewIdRef() +MENU_HELP = wx.NewIdRef() -MENU_DISABLE_MENU_ITEM = wx.Window.NewControlId() -MENU_REMOVE_MENU = wx.Window.NewControlId() -MENU_TRANSPARENCY = wx.Window.NewControlId() +MENU_DISABLE_MENU_ITEM = wx.NewIdRef() +MENU_REMOVE_MENU = wx.NewIdRef() +MENU_TRANSPARENCY = wx.NewIdRef() MENU_NEW_FILE = 10005 MENU_SAVE = 10006 diff --git a/demo/agw/FlatNotebook.py b/demo/agw/FlatNotebook.py index 6a541ccd..e57b1907 100644 --- a/demo/agw/FlatNotebook.py +++ b/demo/agw/FlatNotebook.py @@ -24,51 +24,51 @@ import images #---------------------------------------------------------------------- -MENU_EDIT_DELETE_ALL = wx.Window.NewControlId() -MENU_EDIT_ADD_PAGE = wx.Window.NewControlId() -MENU_EDIT_DELETE_PAGE = wx.Window.NewControlId() -MENU_EDIT_SET_SELECTION = wx.Window.NewControlId() -MENU_EDIT_ADVANCE_SELECTION_FWD = wx.Window.NewControlId() -MENU_EDIT_ADVANCE_SELECTION_BACK = wx.Window.NewControlId() -MENU_SET_ALL_TABS_SHAPE_ANGLE = wx.Window.NewControlId() -MENU_SHOW_IMAGES = wx.Window.NewControlId() -MENU_USE_VC71_STYLE = wx.Window.NewControlId() -MENU_USE_DEFAULT_STYLE = wx.Window.NewControlId() -MENU_USE_FANCY_STYLE = wx.Window.NewControlId() -MENU_USE_RIBBON_STYLE = wx.Window.NewControlId() -MENU_SELECT_GRADIENT_COLOUR_FROM = wx.Window.NewControlId() -MENU_SELECT_GRADIENT_COLOUR_TO = wx.Window.NewControlId() -MENU_SELECT_GRADIENT_COLOUR_BORDER = wx.Window.NewControlId() -MENU_SET_PAGE_IMAGE_INDEX = wx.Window.NewControlId() -MENU_HIDE_X = wx.Window.NewControlId() -MENU_HIDE_NAV_BUTTONS = wx.Window.NewControlId() -MENU_USE_MOUSE_MIDDLE_BTN = wx.Window.NewControlId() -MENU_DRAW_BORDER = wx.Window.NewControlId() -MENU_USE_BOTTOM_TABS = wx.Window.NewControlId() -MENU_ENABLE_TAB = wx.Window.NewControlId() -MENU_DISABLE_TAB = wx.Window.NewControlId() -MENU_ENABLE_DRAG_N_DROP = wx.Window.NewControlId() -MENU_DCLICK_CLOSES_TAB = wx.Window.NewControlId() -MENU_USE_VC8_STYLE = wx.Window.NewControlId() -MENU_USE_FF2_STYLE = wx.Window.NewControlId() -MENU_HIDE_ON_SINGLE_TAB = wx.Window.NewControlId() -MENU_HIDE_TABS = wx.Window.NewControlId() -MENU_NO_TABS_FOCUS = wx.Window.NewControlId() +MENU_EDIT_DELETE_ALL = wx.NewIdRef() +MENU_EDIT_ADD_PAGE = wx.NewIdRef() +MENU_EDIT_DELETE_PAGE = wx.NewIdRef() +MENU_EDIT_SET_SELECTION = wx.NewIdRef() +MENU_EDIT_ADVANCE_SELECTION_FWD = wx.NewIdRef() +MENU_EDIT_ADVANCE_SELECTION_BACK = wx.NewIdRef() +MENU_SET_ALL_TABS_SHAPE_ANGLE = wx.NewIdRef() +MENU_SHOW_IMAGES = wx.NewIdRef() +MENU_USE_VC71_STYLE = wx.NewIdRef() +MENU_USE_DEFAULT_STYLE = wx.NewIdRef() +MENU_USE_FANCY_STYLE = wx.NewIdRef() +MENU_USE_RIBBON_STYLE = wx.NewIdRef() +MENU_SELECT_GRADIENT_COLOUR_FROM = wx.NewIdRef() +MENU_SELECT_GRADIENT_COLOUR_TO = wx.NewIdRef() +MENU_SELECT_GRADIENT_COLOUR_BORDER = wx.NewIdRef() +MENU_SET_PAGE_IMAGE_INDEX = wx.NewIdRef() +MENU_HIDE_X = wx.NewIdRef() +MENU_HIDE_NAV_BUTTONS = wx.NewIdRef() +MENU_USE_MOUSE_MIDDLE_BTN = wx.NewIdRef() +MENU_DRAW_BORDER = wx.NewIdRef() +MENU_USE_BOTTOM_TABS = wx.NewIdRef() +MENU_ENABLE_TAB = wx.NewIdRef() +MENU_DISABLE_TAB = wx.NewIdRef() +MENU_ENABLE_DRAG_N_DROP = wx.NewIdRef() +MENU_DCLICK_CLOSES_TAB = wx.NewIdRef() +MENU_USE_VC8_STYLE = wx.NewIdRef() +MENU_USE_FF2_STYLE = wx.NewIdRef() +MENU_HIDE_ON_SINGLE_TAB = wx.NewIdRef() +MENU_HIDE_TABS = wx.NewIdRef() +MENU_NO_TABS_FOCUS = wx.NewIdRef() -MENU_SET_ACTIVE_TEXT_COLOUR = wx.Window.NewControlId() -MENU_DRAW_TAB_X = wx.Window.NewControlId() -MENU_SET_ACTIVE_TAB_COLOUR = wx.Window.NewControlId() -MENU_SET_TAB_AREA_COLOUR = wx.Window.NewControlId() -MENU_SELECT_NONACTIVE_TEXT_COLOUR = wx.Window.NewControlId() -MENU_GRADIENT_BACKGROUND = wx.Window.NewControlId() -MENU_COLOURFUL_TABS = wx.Window.NewControlId() -MENU_SMART_TABS = wx.Window.NewControlId() -MENU_USE_DROP_ARROW_BUTTON = wx.Window.NewControlId() -MENU_ALLOW_FOREIGN_DND = wx.Window.NewControlId() +MENU_SET_ACTIVE_TEXT_COLOUR = wx.NewIdRef() +MENU_DRAW_TAB_X = wx.NewIdRef() +MENU_SET_ACTIVE_TAB_COLOUR = wx.NewIdRef() +MENU_SET_TAB_AREA_COLOUR = wx.NewIdRef() +MENU_SELECT_NONACTIVE_TEXT_COLOUR = wx.NewIdRef() +MENU_GRADIENT_BACKGROUND = wx.NewIdRef() +MENU_COLOURFUL_TABS = wx.NewIdRef() +MENU_SMART_TABS = wx.NewIdRef() +MENU_USE_DROP_ARROW_BUTTON = wx.NewIdRef() +MENU_ALLOW_FOREIGN_DND = wx.NewIdRef() -MENU_TILE_HORIZONTALLY = wx.Window.NewControlId() -MENU_TILE_VERTICALLY = wx.Window.NewControlId() -MENU_TILE_NONE = wx.Window.NewControlId() +MENU_TILE_HORIZONTALLY = wx.NewIdRef() +MENU_TILE_VERTICALLY = wx.NewIdRef() +MENU_TILE_NONE = wx.NewIdRef() class FlatNotebookDemo(wx.Frame): diff --git a/demo/agw/FoldPanelBar.py b/demo/agw/FoldPanelBar.py index 23d86507..167aa6db 100644 --- a/demo/agw/FoldPanelBar.py +++ b/demo/agw/FoldPanelBar.py @@ -297,11 +297,11 @@ class Extended(wx.Frame): item = self._pnl.AddFoldPanel("Caption Style", False, foldIcons=Images) - self.ID_USE_VGRADIENT = wx.Window.NewControlId() - self.ID_USE_HGRADIENT = wx.Window.NewControlId() - self.ID_USE_SINGLE = wx.Window.NewControlId() - self.ID_USE_RECTANGLE = wx.Window.NewControlId() - self.ID_USE_FILLED_RECTANGLE = wx.Window.NewControlId() + self.ID_USE_VGRADIENT = wx.NewIdRef() + self.ID_USE_HGRADIENT = wx.NewIdRef() + self.ID_USE_SINGLE = wx.NewIdRef() + self.ID_USE_RECTANGLE = wx.NewIdRef() + self.ID_USE_FILLED_RECTANGLE = wx.NewIdRef() currStyle = wx.RadioButton(item, self.ID_USE_VGRADIENT, "&Vertical Gradient") self._pnl.AddFoldPanelWindow(item, currStyle, fpb.FPB_ALIGN_WIDTH, @@ -523,13 +523,13 @@ class Extended(wx.Frame): # Make a menubar file_menu = wx.Menu() - FPBTEST_QUIT = wx.Window.NewControlId() - FPBTEST_REFRESH = wx.Window.NewControlId() - FPB_BOTTOM_FOLD = wx.Window.NewControlId() - FPB_SINGLE_FOLD = wx.Window.NewControlId() - FPB_EXCLUSIVE_FOLD = wx.Window.NewControlId() - FPBTEST_TOGGLE_WINDOW = wx.Window.NewControlId() - FPBTEST_ABOUT = wx.Window.NewControlId() + FPBTEST_QUIT = wx.NewIdRef() + FPBTEST_REFRESH = wx.NewIdRef() + FPB_BOTTOM_FOLD = wx.NewIdRef() + FPB_SINGLE_FOLD = wx.NewIdRef() + FPB_EXCLUSIVE_FOLD = wx.NewIdRef() + FPBTEST_TOGGLE_WINDOW = wx.NewIdRef() + FPBTEST_ABOUT = wx.NewIdRef() file_menu.Append(FPBTEST_QUIT, "&Exit") @@ -722,10 +722,10 @@ class Collapsed(wx.Frame): def CreateMenuBar(self): - FoldPanelBarTest_Quit = wx.Window.NewControlId() - FoldPanelBarTest_About = wx.Window.NewControlId() - FoldPanelBarTest_Horizontal = wx.Window.NewControlId() - FoldPanelBarTest_Vertical = wx.Window.NewControlId() + FoldPanelBarTest_Quit = wx.NewIdRef() + FoldPanelBarTest_About = wx.NewIdRef() + FoldPanelBarTest_Horizontal = wx.NewIdRef() + FoldPanelBarTest_Vertical = wx.NewIdRef() menuFile = wx.Menu() menuFile.Append(FoldPanelBarTest_Horizontal, "&Horizontal\tAlt-H") @@ -846,8 +846,8 @@ class NotCollapsed(wx.Frame): def CreateMenuBar(self): - FoldPanelBarTest_Quit = wx.Window.NewControlId() - FoldPanelBarTest_About = wx.Window.NewControlId() + FoldPanelBarTest_Quit = wx.NewIdRef() + FoldPanelBarTest_About = wx.NewIdRef() menuFile = wx.Menu() menuFile.Append(FoldPanelBarTest_Quit, "E&xit\tAlt-X", "Quit This Program") diff --git a/demo/agw/HyperLinkCtrl.py b/demo/agw/HyperLinkCtrl.py index 1193afaf..61df943f 100644 --- a/demo/agw/HyperLinkCtrl.py +++ b/demo/agw/HyperLinkCtrl.py @@ -107,8 +107,8 @@ class TestPanel(wx.Panel): def OnRightLink(self, event): pos = self._hyper3.GetPosition() + event.GetPosition() menuPopUp = wx.Menu("Having a nice day?") - ID_MENU_YES = wx.Window.NewControlId() - ID_MENU_NO = wx.Window.NewControlId() + ID_MENU_YES = wx.NewIdRef() + ID_MENU_NO = wx.NewIdRef() menuPopUp.Append(ID_MENU_YES, "Yes, absolutely!") menuPopUp.Append(ID_MENU_NO, "I've had better") self.PopupMenu(menuPopUp) diff --git a/demo/agw/HyperTreeList.py b/demo/agw/HyperTreeList.py index f03ec378..5cffc7da 100644 --- a/demo/agw/HyperTreeList.py +++ b/demo/agw/HyperTreeList.py @@ -1072,13 +1072,13 @@ class HyperTreeListDemo(wx.Frame): file_menu = wx.Menu() - AS_EXIT = wx.Window.NewControlId() + AS_EXIT = wx.NewIdRef() file_menu.Append(AS_EXIT, "&Exit") self.Bind(wx.EVT_MENU, self.OnClose, id=AS_EXIT) help_menu = wx.Menu() - AS_ABOUT = wx.Window.NewControlId() + AS_ABOUT = wx.NewIdRef() help_menu.Append(AS_ABOUT, "&About...") self.Bind(wx.EVT_MENU, self.OnAbout, id=AS_ABOUT) diff --git a/demo/agw/ShapedButton.py b/demo/agw/ShapedButton.py index 6e88fa8b..c909325d 100644 --- a/demo/agw/ShapedButton.py +++ b/demo/agw/ShapedButton.py @@ -340,13 +340,13 @@ class ShapedButtonDemo(wx.Frame): file_menu = wx.Menu() - AS_EXIT = wx.Window.NewControlId() + AS_EXIT = wx.NewIdRef() file_menu.Append(AS_EXIT, "&Exit") self.Bind(wx.EVT_MENU, self.OnClose, id=AS_EXIT) help_menu = wx.Menu() - AS_ABOUT = wx.Window.NewControlId() + AS_ABOUT = wx.NewIdRef() help_menu.Append(AS_ABOUT, "&About...") self.Bind(wx.EVT_MENU, self.OnAbout, id=AS_ABOUT) diff --git a/demo/agw/ShortcutEditor.py b/demo/agw/ShortcutEditor.py index b1bd197a..7ac2d183 100644 --- a/demo/agw/ShortcutEditor.py +++ b/demo/agw/ShortcutEditor.py @@ -33,7 +33,7 @@ TOP_MENUS = ['File', 'Edit', 'View', 'Options', 'Window', 'Help'] COMBINATIONS = string.ascii_uppercase + string.digits COMBINATIONS = [c for c in COMBINATIONS] + list(SE.KEYMAP.values()) -ACCEL_IDS = [wx.Window.NewControlId() for i in range(6)] +ACCEL_IDS = wx.NewIdRef(6) _ = wx.GetTranslation diff --git a/demo/agw/ThumbnailCtrl.py b/demo/agw/ThumbnailCtrl.py index 37aa3fdf..663b698d 100644 --- a/demo/agw/ThumbnailCtrl.py +++ b/demo/agw/ThumbnailCtrl.py @@ -166,13 +166,13 @@ class ThumbnailCtrlDemo(wx.Frame): file_menu = wx.Menu() - AS_EXIT = wx.Window.NewControlId() + AS_EXIT = wx.NewIdRef() file_menu.Append(AS_EXIT, "&Exit") self.Bind(wx.EVT_MENU, self.OnClose, id=AS_EXIT) help_menu = wx.Menu() - AS_ABOUT = wx.Window.NewControlId() + AS_ABOUT = wx.NewIdRef() help_menu.Append(AS_ABOUT, "&About...") self.Bind(wx.EVT_MENU, self.OnAbout, id=AS_ABOUT) @@ -431,18 +431,18 @@ class ThumbnailCtrlDemo(wx.Frame): def CreatePopups(self): if not hasattr(self, "popupID1"): - self.popupID1 = wx.Window.NewControlId() - self.popupID2 = wx.Window.NewControlId() - self.popupID3 = wx.Window.NewControlId() - self.popupID4 = wx.Window.NewControlId() - self.popupID5 = wx.Window.NewControlId() - self.popupID6 = wx.Window.NewControlId() - self.popupID7 = wx.Window.NewControlId() - self.popupID8 = wx.Window.NewControlId() - self.popupID9 = wx.Window.NewControlId() - self.popupID10 = wx.Window.NewControlId() - self.popupID11 = wx.Window.NewControlId() - self.popupID12 = wx.Window.NewControlId() + self.popupID1 = wx.NewIdRef() + self.popupID2 = wx.NewIdRef() + self.popupID3 = wx.NewIdRef() + self.popupID4 = wx.NewIdRef() + self.popupID5 = wx.NewIdRef() + self.popupID6 = wx.NewIdRef() + self.popupID7 = wx.NewIdRef() + self.popupID8 = wx.NewIdRef() + self.popupID9 = wx.NewIdRef() + self.popupID10 = wx.NewIdRef() + self.popupID11 = wx.NewIdRef() + self.popupID12 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1) self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2) @@ -480,9 +480,9 @@ class ThumbnailCtrlDemo(wx.Frame): def CreateGlobalPopups(self): if not hasattr(self, "popupID10"): - self.popupID10 = wx.Window.NewControlId() - self.popupID11 = wx.Window.NewControlId() - self.popupID12 = wx.Window.NewControlId() + self.popupID10 = wx.NewIdRef() + self.popupID11 = wx.NewIdRef() + self.popupID12 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupTen, id=self.popupID10) self.Bind(wx.EVT_MENU, self.OnPopupEleven, id=self.popupID11) diff --git a/demo/agw/UltimateReportDemo.py b/demo/agw/UltimateReportDemo.py index 1a46dd61..ec85d3fe 100644 --- a/demo/agw/UltimateReportDemo.py +++ b/demo/agw/UltimateReportDemo.py @@ -855,12 +855,12 @@ class UltimateListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin): # only do this part the first time so the events are only bound once if not hasattr(self, "popupID1"): - self.popupID1 = wx.Window.NewControlId() - self.popupID2 = wx.Window.NewControlId() - self.popupID3 = wx.Window.NewControlId() - self.popupID4 = wx.Window.NewControlId() - self.popupID5 = wx.Window.NewControlId() - self.popupID6 = wx.Window.NewControlId() + self.popupID1 = wx.NewIdRef() + self.popupID2 = wx.NewIdRef() + self.popupID3 = wx.NewIdRef() + self.popupID4 = wx.NewIdRef() + self.popupID5 = wx.NewIdRef() + self.popupID6 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1) self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2) diff --git a/demo/infoframe.py b/demo/infoframe.py index 5a92b62f..e4e07898 100644 --- a/demo/infoframe.py +++ b/demo/infoframe.py @@ -17,12 +17,12 @@ class MyFrame(wx.Frame): menu = wx.Menu() # Enable output menu item - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() menu.Append(mID, "&Enable output", "Display output frame") self.Bind(wx.EVT_MENU, output.EnableOutput, id=mID) # Disable output menu item - mID = wx.Window.NewControlId() + mID = wx.NewIdRef() menu.Append(mID, "&Disable output", "Close output frame") self.Bind(wx.EVT_MENU, output.DisableOutput, id=mID) diff --git a/etg/windowid.py b/etg/windowid.py index 1060ac1d..27b041b3 100644 --- a/etg/windowid.py +++ b/etg/windowid.py @@ -72,14 +72,22 @@ def run(): return self->GetValue(); """) - klass.addCppMethod('int', '__int__', '()', doc="Alias for GetValue allowing the IDRef to be passed as the WindowID parameter when creating widgets or etc.", body="""\ return self->GetValue(); """) + + klass.addCppMethod('bool', '__eq__', '(wxWindowID id)', "return self->GetValue() == id;") + klass.addCppMethod('bool', '__ne__', '(wxWindowID id)', "return self->GetValue() != id;") + klass.addCppMethod('bool', '__lt__', '(wxWindowID id)', "return self->GetValue() < id;") + klass.addCppMethod('bool', '__gt__', '(wxWindowID id)', "return self->GetValue() > id;") + klass.addCppMethod('bool', '__le__', '(wxWindowID id)', "return self->GetValue() <= id;") + klass.addCppMethod('bool', '__ge__', '(wxWindowID id)', "return self->GetValue() >= id;") klass.addPyMethod('__repr__', '(self)', 'return "WindowIDRef: {}".format(self.GetId())') + klass.addPyMethod('__hash__', '(self)', 'return hash(self.GetValue())') + # and finish it up by adding it to the module module.addItem(klass) diff --git a/samples/floatcanvas/MovingPlot.py b/samples/floatcanvas/MovingPlot.py index 5ee561b4..44bc9af8 100644 --- a/samples/floatcanvas/MovingPlot.py +++ b/samples/floatcanvas/MovingPlot.py @@ -82,7 +82,7 @@ class DrawFrame(wx.Frame): self.timer = None - self.DrawAxis() + self.DrawAxis() return None @@ -170,7 +170,7 @@ class DrawFrame(wx.Frame): InForeground = 1) self.Canvas.Draw() - self.timerID = wx.NewId() + self.timerID = wx.NewIdRef() self.timer = wx.Timer(self,self.timerID) self.Bind(wx.EVT_TIMER, self.OnTimer, id=self.timerID) diff --git a/samples/floatcanvas/PolyEditor.py b/samples/floatcanvas/PolyEditor.py index 72588d2f..588e823f 100644 --- a/samples/floatcanvas/PolyEditor.py +++ b/samples/floatcanvas/PolyEditor.py @@ -38,7 +38,7 @@ class DrawFrame(wx.Frame): MenuBar.Append(FileMenu, "&File") view_menu = wx.Menu() - zfit = view_menu.Append(wx.NewId(), "Zoom to &Fit", "Zoom to fit the window") + zfit = view_menu.Append(wx.ID_ANY, "Zoom to &Fit", "Zoom to fit the window") self.Bind(wx.EVT_MENU, self.ZoomToFit, zfit) MenuBar.Append(view_menu, "&View") diff --git a/unittests/test_windowid.py b/unittests/test_windowid.py index 02633495..4593e5a6 100644 --- a/unittests/test_windowid.py +++ b/unittests/test_windowid.py @@ -58,7 +58,29 @@ class IdManagerTest(wtc.WidgetTestCase): b.Destroy() + def test_WindowIDRef01(self): + ref1 = wx.WindowIDRef(wx.IdManager.ReserveId()) + ref2 = wx.WindowIDRef(wx.IdManager.ReserveId()) + val = ref1 == ref2 + assert type(val) == bool + val = ref1 != ref2 + assert type(val) == bool + val = ref1 > ref2 + assert type(val) == bool + val = ref1 < ref2 + assert type(val) == bool + val = ref1 >= ref2 + assert type(val) == bool + val = ref1 <= ref2 + assert type(val) == bool + + def test_WindowIDRef02(self): + d = {wx.NewIdRef(): 'one', + wx.NewIdRef(): 'two'} + keys = sorted(d.keys()) + for k in keys: + val = d[k] #--------------------------------------------------------------------------- diff --git a/wx/lib/activex.py b/wx/lib/activex.py index 440cce37..55231b98 100644 --- a/wx/lib/activex.py +++ b/wx/lib/activex.py @@ -120,7 +120,7 @@ class ActiveXCtrl(wx.msw.PyAxBaseWindow): # Set some wx.Window properties if wxid == wx.ID_ANY: - wxid = wx.Window.NewControlId() + wxid = wx.NewIdRef() self.SetId(wxid) self.SetName(name) self.SetMinSize(size) diff --git a/wx/lib/agw/aui/auibar.py b/wx/lib/agw/aui/auibar.py index c7f9d317..d3534152 100644 --- a/wx/lib/agw/aui/auibar.py +++ b/wx/lib/agw/aui/auibar.py @@ -1826,7 +1826,7 @@ class AuiToolBar(wx.Control): item.spacer_pixels = 0 if tool_id == wx.ID_ANY: - tool_id = wx.Window.NewControlId() + tool_id = wx.NewIdRef() item.id = tool_id item.state = 0 @@ -1931,7 +1931,7 @@ class AuiToolBar(wx.Control): item.spacer_pixels = 0 if tool_id == wx.ID_ANY: - tool_id = wx.Window.NewControlId() + tool_id = wx.NewIdRef() item.id = tool_id item.state = 0 diff --git a/wx/lib/agw/buttonpanel.py b/wx/lib/agw/buttonpanel.py index 1f5747c2..7017c8ff 100644 --- a/wx/lib/agw/buttonpanel.py +++ b/wx/lib/agw/buttonpanel.py @@ -853,7 +853,7 @@ class Control(wx.EvtHandler): self._parent = parent if id == wx.ID_ANY: - self._id = wx.Window.NewControlId() + self._id = wx.NewIdRef() else: self._id = id @@ -1387,7 +1387,7 @@ class ButtonInfo(Control): """ if id == wx.ID_ANY: - id = wx.Window.NewControlId() + id = wx.NewIdRef() self._status = status self._rect = wx.Rect() diff --git a/wx/lib/agw/flatmenu.py b/wx/lib/agw/flatmenu.py index 66db3609..e6cc9c6e 100644 --- a/wx/lib/agw/flatmenu.py +++ b/wx/lib/agw/flatmenu.py @@ -2234,7 +2234,7 @@ class MenuEntryInfo(object): self._rect = wx.Rect() self._state = state if cmd == wx.ID_ANY: - cmd = wx.Window.NewControlId() + cmd = wx.NewIdRef() self._cmd = cmd # the menu itself accelerator id @@ -3560,7 +3560,7 @@ class FlatMenuBar(wx.Panel): if not self._moreMenu: # first time self._moreMenu = FlatMenu(self) - self._popupDlgCmdId = wx.Window.NewControlId() + self._popupDlgCmdId = wx.NewIdRef() # Connect an event handler for this event self.Connect(self._popupDlgCmdId, -1, wxEVT_FLAT_MENU_SELECTED, self.OnCustomizeDlg) @@ -3956,7 +3956,7 @@ class FlatMenuButton(object): self._parent = menu self._pos = wx.Point() self._size = wx.Size() - self._timerID = wx.Window.NewControlId() + self._timerID = wx.NewIdRef() self._scrollOnHover = scrollOnHover if not disabledBmp.IsOk(): @@ -4565,11 +4565,11 @@ class FlatToolbarItem(object): """ if id == wx.ID_ANY: - id = wx.Window.NewControlId() + id = wx.NewIdRef() if controlType is None: # Is a separator self._normalBmp = wx.NullBitmap - self._id = wx.Window.NewControlId() + self._id = wx.NewIdRef() self._label = "" self._disabledImg = wx.NullBitmap self._customCtrl = None @@ -4837,7 +4837,7 @@ class FlatMenuItem(object): self._helpString = helpString if id == wx.ID_ANY: - id = wx.Window.NewControlId() + id = wx.NewIdRef() self._id = id self._parentMenu = parent diff --git a/wx/lib/agw/fmcustomizedlg.py b/wx/lib/agw/fmcustomizedlg.py index 4cbc2f27..920c38a9 100644 --- a/wx/lib/agw/fmcustomizedlg.py +++ b/wx/lib/agw/fmcustomizedlg.py @@ -286,7 +286,7 @@ class FMCustomizeDlg(wx.Dialog): self._visibleMenus = visible self._hiddenMenus = hidden - self._menuListId = wx.Window.NewControlId() + self._menuListId = wx.NewIdRef() self._checkListMenus = wx.CheckListBox(menus, self._menuListId, pos=wx.DefaultPosition, size=wx.Size(250, 250), choices=self.order, style=wx.BORDER_SIMPLE) self._checkListMenus.Bind(wx.EVT_CHECKLISTBOX, self.OnMenuChecked) @@ -338,7 +338,7 @@ class FMCustomizeDlg(wx.Dialog): # + Menu bar background colour (combo button) #----------------------------------------------------------- - self._menuStyleID = wx.Window.NewControlId() + self._menuStyleID = wx.NewIdRef() choices = [_("Default Style"), _("Metallic")] self._menuStyle = wx.RadioBox(options, self._menuStyleID, _("Menu bar style"), wx.DefaultPosition, wx.DefaultSize, choices) @@ -357,19 +357,19 @@ class FMCustomizeDlg(wx.Dialog): vsizer.Add(self._menuStyle, 0, wx.EXPAND | wx.ALL, 5) self._sbStyle = wx.StaticBoxSizer(wx.StaticBox(options, -1, _("Default style settings")), wx.VERTICAL) - self._drawVertGradID = wx.Window.NewControlId() + self._drawVertGradID = wx.NewIdRef() self._verticalGradient = wx.CheckBox(options, self._drawVertGradID, _("Draw vertical gradient")) self._verticalGradient.Bind(wx.EVT_CHECKBOX, self.OnChangeStyle) self._sbStyle.Add(self._verticalGradient, 0, wx.EXPAND | wx.ALL, 3) self._verticalGradient.SetValue(ArtManager.Get().GetMBVerticalGradient()) - self._drawBorderID = wx.Window.NewControlId() + self._drawBorderID = wx.NewIdRef() self._drawBorder = wx.CheckBox(options, self._drawBorderID, _("Draw border around menu bar")) self._drawBorder.Bind(wx.EVT_CHECKBOX, self.OnChangeStyle) self._sbStyle.Add(self._drawBorder, 0, wx.EXPAND | wx.ALL, 3) self._drawBorder.SetValue(ArtManager.Get().GetMenuBarBorder()) - self._shadowUnderTBID = wx.Window.NewControlId() + self._shadowUnderTBID = wx.NewIdRef() self._shadowUnderTB = wx.CheckBox(options, self._shadowUnderTBID, _("Toolbar float over menu bar")) self._shadowUnderTB.Bind(wx.EVT_CHECKBOX, self.OnChangeStyle) self._sbStyle.Add(self._shadowUnderTB, 0, wx.EXPAND | wx.ALL, 3) @@ -379,7 +379,7 @@ class FMCustomizeDlg(wx.Dialog): # Misc sb = wx.StaticBoxSizer(wx.StaticBox(options, -1, _("Colour Scheme")), wx.VERTICAL) - self._colourID = wx.Window.NewControlId() + self._colourID = wx.NewIdRef() colourChoices = ArtManager.Get().GetColourSchemes() colourChoices.sort() diff --git a/wx/lib/agw/pygauge.py b/wx/lib/agw/pygauge.py index 222db62b..774ac56d 100644 --- a/wx/lib/agw/pygauge.py +++ b/wx/lib/agw/pygauge.py @@ -150,7 +150,7 @@ class PyGauge(wx.Window): self._value = [0] self._valueSorted = [0] - self._timerId = wx.Window.NewControlId() + self._timerId = wx.NewIdRef() self._timer = None self._drawIndicatorText = False diff --git a/wx/lib/agw/rulerctrl.py b/wx/lib/agw/rulerctrl.py index a738cd3d..eaf27dd4 100644 --- a/wx/lib/agw/rulerctrl.py +++ b/wx/lib/agw/rulerctrl.py @@ -390,7 +390,7 @@ class Indicator(object): self._parent = parent if id == wx.ID_ANY: - id = wx.Window.NewControlId() + id = wx.NewIdRef() self._id = id self._colour = None diff --git a/wx/lib/agw/toasterbox.py b/wx/lib/agw/toasterbox.py index b1e3ef68..35ee907a 100644 --- a/wx/lib/agw/toasterbox.py +++ b/wx/lib/agw/toasterbox.py @@ -984,7 +984,7 @@ class ToasterBoxWindow(wx.Frame): self._direction = wx.UP self.SetupPositions() self.ScrollUp() - timerid = wx.Window.NewControlId() + timerid = wx.NewIdRef() self.showtime = wx.Timer(self, timerid) self.showtime.Start(self._pausetime) self.Bind(wx.EVT_TIMER, self.NotifyTimer, id=timerid) diff --git a/wx/lib/analogclock/analogclock.py b/wx/lib/analogclock/analogclock.py index 701d9d44..7c4b1897 100644 --- a/wx/lib/analogclock/analogclock.py +++ b/wx/lib/analogclock/analogclock.py @@ -76,8 +76,8 @@ class AnalogClock(wx.Window): self.Setup = None # Make a context menu. - popup1 = wx.Window.NewControlId() - popup2 = wx.Window.NewControlId() + popup1 = wx.NewIdRef() + popup2 = wx.NewIdRef() cm = self.cm = wx.Menu() cm.Append(popup1, "Customize...") cm.Append(popup2, "About...") diff --git a/wx/lib/colourchooser/pycolourchooser.py b/wx/lib/colourchooser/pycolourchooser.py index 29193fb4..cd50de73 100644 --- a/wx/lib/colourchooser/pycolourchooser.py +++ b/wx/lib/colourchooser/pycolourchooser.py @@ -125,8 +125,8 @@ class PyColourChooser(wx.Panel): ] * NO_CUSTOM_COLOURS last_custom = 0 - idADD_CUSTOM = wx.Window.NewControlId() - idSCROLL = wx.Window.NewControlId() + idADD_CUSTOM = wx.NewIdRef() + idSCROLL = wx.NewIdRef() def __init__(self, parent, id): """Creates an instance of the colour chooser. Note that it is best to @@ -148,7 +148,7 @@ class PyColourChooser(wx.Panel): self.colour_boxs = [ ] colour_grid = wx.GridSizer(rows=6, cols=8, vgap=0, hgap=0) for name in self.colour_names: - new_id = wx.Window.NewControlId() + new_id = wx.NewIdRef() box = pycolourbox.PyColourBox(self, new_id) box.GetColourBox().Bind(wx.EVT_LEFT_DOWN, lambda x, b=box: self.onBasicClick(x, b)) @@ -160,7 +160,7 @@ class PyColourChooser(wx.Panel): self.custom_boxs = [ ] custom_grid = wx.GridSizer(rows=2, cols=8, vgap=0, hgap=0) for wxcolour, slidepos in self.custom_colours: - new_id = wx.Window.NewControlId() + new_id = wx.NewIdRef() custom = pycolourbox.PyColourBox(self, new_id) custom.GetColourBox().Bind(wx.EVT_LEFT_DOWN, lambda x, b=custom: self.onCustomClick(x, b)) diff --git a/wx/lib/filebrowsebutton.py b/wx/lib/filebrowsebutton.py index 6580de8d..591712f9 100644 --- a/wx/lib/filebrowsebutton.py +++ b/wx/lib/filebrowsebutton.py @@ -414,10 +414,10 @@ if __name__ == "__main__": labelText = "Simple dir browse button", style = wx.SUNKEN_BORDER|wx.CLIP_CHILDREN) innerbox.Add( control, 0, wx.EXPAND) - ID = wx.Window.NewControlId() + ID = wx.NewIdRef() innerbox.Add( wx.Button( panel, ID,"Change Label", ), 1, wx.EXPAND) self.Bind(wx.EVT_BUTTON, self.OnChangeLabel , id=ID) - ID = wx.Window.NewControlId() + ID = wx.NewIdRef() innerbox.Add( wx.Button( panel, ID,"Change Value", ), 1, wx.EXPAND) self.Bind(wx.EVT_BUTTON, self.OnChangeValue, id=ID ) panel.SetAutoLayout(True) diff --git a/wx/lib/foldmenu.py b/wx/lib/foldmenu.py index 8931ec51..11f6d044 100644 --- a/wx/lib/foldmenu.py +++ b/wx/lib/foldmenu.py @@ -23,7 +23,7 @@ class FoldOutWindow(wx.PopupWindow): self.SetBackgroundColour(faceClr) def AddButton(self,bitmap,handler=None): - id=wx.Window.NewControlId() + id=wx.NewIdRef() btn=wx.BitmapButton(self,id,bitmap) self.sizer.Add(btn, 1, wx.ALIGN_CENTER|wx.ALL|wx.EXPAND, 2) self.Bind(wx.EVT_BUTTON, self.OnBtnClick, btn) diff --git a/wx/lib/imagebrowser.py b/wx/lib/imagebrowser.py index b5add72c..24912f37 100644 --- a/wx/lib/imagebrowser.py +++ b/wx/lib/imagebrowser.py @@ -98,13 +98,13 @@ _ = wx.GetTranslation #--------------------------------------------------------------------------- BAD_IMAGE = -1 -ID_WHITE_BG = wx.Window.NewControlId() -ID_BLACK_BG = wx.Window.NewControlId() -ID_GREY_BG = wx.Window.NewControlId() -ID_CHECK_BG = wx.Window.NewControlId() -ID_NO_FRAME = wx.Window.NewControlId() -ID_BOX_FRAME = wx.Window.NewControlId() -ID_CROP_FRAME = wx.Window.NewControlId() +ID_WHITE_BG = wx.NewIdRef() +ID_BLACK_BG = wx.NewIdRef() +ID_GREY_BG = wx.NewIdRef() +ID_CHECK_BG = wx.NewIdRef() +ID_NO_FRAME = wx.NewIdRef() +ID_BOX_FRAME = wx.NewIdRef() +ID_CROP_FRAME = wx.NewIdRef() def ConvertBMP(file_nm): """ diff --git a/wx/lib/masked/maskededit.py b/wx/lib/masked/maskededit.py index 86bd61bc..69d16962 100644 --- a/wx/lib/masked/maskededit.py +++ b/wx/lib/masked/maskededit.py @@ -6529,7 +6529,7 @@ class __test(wx.App): self.editList = [] rowcount = 4 - id, id1 = wx.Window.NewControlId(), wx.Window.NewControlId() + id, id1 = wx.NewIdRef(2) self.command1 = wx.Button( self.panel, id, "&Close" ) self.command2 = wx.Button( self.panel, id1, "&AutoFormats" ) self.sizer.Add(self.command1, row=0, col=0, flag=wx.ALL, border = 5) @@ -6704,7 +6704,7 @@ To see a great example of validations in action, try entering a bad email addres self.sizer.Add( self.label3, row=3,col=1, flag=wx.ALL,border=5) self.sizer.Add( self.label4, row=3,col=2, flag=wx.ALL,border=5) - id, id1 = wx.Window.NewControlId(), wx.Window.NewControlId() + id, id1 = wx.NewIdRef(2) self.command1 = wx.Button( self.panel, id, "&Close") self.command2 = wx.Button( self.panel, id1, "&Print Formats") self.panel.Bind(wx.EVT_BUTTON, self.onClick, self.command1) diff --git a/wx/lib/newevent.py b/wx/lib/newevent.py index 1fb5a73c..e660e22f 100644 --- a/wx/lib/newevent.py +++ b/wx/lib/newevent.py @@ -46,8 +46,8 @@ Sample usage:: time.sleep(DELAY) wx.PostEvent(win, GooEvent(id, goo=id)) - ID_CMD1 = wx.Window.NewControlId() - ID_CMD2 = wx.Window.NewControlId() + ID_CMD1 = wx.NewIdRef() + ID_CMD2 = wx.NewIdRef() class Frame(wx.Frame): def __init__(self): @@ -170,8 +170,8 @@ def _test(): time.sleep(DELAY) wx.PostEvent(win, GooEvent(id, goo=id)) - ID_CMD1 = wx.Window.NewControlId() - ID_CMD2 = wx.Window.NewControlId() + ID_CMD1 = wx.NewIdRef() + ID_CMD2 = wx.NewIdRef() class Frame(wx.Frame): def __init__(self): diff --git a/wx/lib/ogl/basic.py b/wx/lib/ogl/basic.py index d31f9b39..52655709 100644 --- a/wx/lib/ogl/basic.py +++ b/wx/lib/ogl/basic.py @@ -966,7 +966,7 @@ class Shape(ShapeEvtHandler): def AssignNewIds(self): """Assign new ids to this image and its children.""" - self._id = wx.Window.NewControlId() + self._id = wx.NewIdRef() for child in self._children: child.AssignNewIds() diff --git a/wx/lib/ogl/composit.py b/wx/lib/ogl/composit.py index ab7cb3ea..8eb25831 100644 --- a/wx/lib/ogl/composit.py +++ b/wx/lib/ogl/composit.py @@ -663,7 +663,7 @@ class CompositeShape(RectangleShape): """ self._constraints.append(constraint) if constraint._constraintId == 0: - constraint._constraintId = wx.Window.NewControlId() + constraint._constraintId = wx.NewIdRef() return constraint def AddSimpleConstraint(self, type, constraining, constrained): @@ -677,7 +677,7 @@ class CompositeShape(RectangleShape): """ constraint = Constraint(type, constraining, constrained) if constraint._constraintId == 0: - constraint._constraintId = wx.Window.NewControlId() + constraint._constraintId = wx.NewIdRef() self._constraints.append(constraint) return constraint diff --git a/wx/lib/ogl/lines.py b/wx/lib/ogl/lines.py index 2503d0d0..68de5e61 100644 --- a/wx/lib/ogl/lines.py +++ b/wx/lib/ogl/lines.py @@ -122,7 +122,7 @@ class ArrowHead(object): self._metaFile = mf self._id = arrowId if self._id == -1: - self._id = wx.Window.NewControlId() + self._id = wx.NewIdRef() def _GetType(self): return self._arrowType diff --git a/wx/lib/pydocview.py b/wx/lib/pydocview.py index afca0770..9017edb9 100644 --- a/wx/lib/pydocview.py +++ b/wx/lib/pydocview.py @@ -34,8 +34,8 @@ else: # Constants #---------------------------------------------------------------------------- -VIEW_TOOLBAR_ID = wx.Window.NewControlId() -VIEW_STATUSBAR_ID = wx.Window.NewControlId() +VIEW_TOOLBAR_ID = wx.NewIdRef() +VIEW_STATUSBAR_ID = wx.NewIdRef() EMBEDDED_WINDOW_TOP = 1 EMBEDDED_WINDOW_BOTTOM = 2 @@ -48,7 +48,7 @@ EMBEDDED_WINDOW_BOTTOMRIGHT = 128 EMBEDDED_WINDOW_ALL = EMBEDDED_WINDOW_TOP | EMBEDDED_WINDOW_BOTTOM | EMBEDDED_WINDOW_LEFT | EMBEDDED_WINDOW_RIGHT | \ EMBEDDED_WINDOW_TOPLEFT | EMBEDDED_WINDOW_BOTTOMLEFT | EMBEDDED_WINDOW_TOPRIGHT | EMBEDDED_WINDOW_BOTTOMRIGHT -SAVEALL_ID = wx.Window.NewControlId() +SAVEALL_ID = wx.NewIdRef() WINDOW_MENU_NUM_ITEMS = 9 @@ -899,13 +899,13 @@ class DocTabbedParentFrame(wx.Frame, DocFrameMixIn, DocMDIParentFrameMixIn): x, y = event.GetX(), event.GetY() if index > -1: doc = self._notebook.GetPage(index).GetView().GetDocument() - id = wx.Window.NewControlId() + id = wx.NewIdRef() menu.Append(id, _("Close")) def OnRightMenuSelect(event): doc.DeleteAllViews() wx.EVT_MENU(self, id, OnRightMenuSelect) if self._notebook.GetPageCount() > 1: - id = wx.Window.NewControlId() + id = wx.NewIdRef() menu.Append(id, _("Close All but \"%s\"" % doc.GetPrintableName())) def OnRightMenuSelect(event): for i in range(self._notebook.GetPageCount()-1, -1, -1): # Go from len-1 to 0 @@ -924,7 +924,7 @@ class DocTabbedParentFrame(wx.Frame, DocFrameMixIn, DocMDIParentFrameMixIn): if self._notebook.GetPageCount() > 1: selectIDs = {} for i in range(0, self._notebook.GetPageCount()): - id = wx.Window.NewControlId() + id = wx.NewIdRef() selectIDs[id] = i tabsMenu.Append(id, self._notebook.GetPageText(i)) def OnRightMenuSelect(event): @@ -2542,7 +2542,7 @@ class FilePropertiesService(DocService): with the current document. """ - PROPERTIES_ID = wx.Window.NewControlId() + PROPERTIES_ID = wx.NewIdRef() def __init__(self): @@ -2851,11 +2851,11 @@ class WindowMenuService(DocService): #---------------------------------------------------------------------------- # Constants #---------------------------------------------------------------------------- - ARRANGE_WINDOWS_ID = wx.Window.NewControlId() - SELECT_MORE_WINDOWS_ID = wx.Window.NewControlId() - SELECT_NEXT_WINDOW_ID = wx.Window.NewControlId() - SELECT_PREV_WINDOW_ID = wx.Window.NewControlId() - CLOSE_CURRENT_WINDOW_ID = wx.Window.NewControlId() + ARRANGE_WINDOWS_ID = wx.NewIdRef() + SELECT_MORE_WINDOWS_ID = wx.NewIdRef() + SELECT_NEXT_WINDOW_ID = wx.NewIdRef() + SELECT_PREV_WINDOW_ID = wx.NewIdRef() + CLOSE_CURRENT_WINDOW_ID = wx.NewIdRef() def __init__(self): @@ -2864,7 +2864,7 @@ class WindowMenuService(DocService): """ self._selectWinIds = [] for i in range(0, 9): - self._selectWinIds.append(wx.Window.NewControlId()) + self._selectWinIds.append(wx.NewIdRef()) def InstallControls(self, frame, menuBar=None, toolBar=None, statusBar=None, document=None): @@ -3056,7 +3056,7 @@ class WindowMenuService(DocService): if numPages > len(self._selectWinIds): for i in range(len(self._selectWinIds), numPages): - self._selectWinIds.append(wx.Window.NewControlId()) + self._selectWinIds.append(wx.NewIdRef()) wx.EVT_MENU(currentFrame, self._selectWinIds[i], self.OnCtrlKeySelect) for i in range(0, numPages): diff --git a/wx/lib/throbber.py b/wx/lib/throbber.py index a29c2b66..e8985332 100644 --- a/wx/lib/throbber.py +++ b/wx/lib/throbber.py @@ -151,7 +151,7 @@ class Throbber(wx.Panel): self.SetClientSize((width, height)) - timerID = wx.Window.NewControlId() + timerID = wx.NewIdRef() self.timer = wx.Timer(self, timerID) self.Bind(EVT_UPDATE_THROBBER, self.Update) diff --git a/wx/py/frame.py b/wx/py/frame.py index 85e7d554..405edde5 100644 --- a/wx/py/frame.py +++ b/wx/py/frame.py @@ -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() diff --git a/wx/py/shell.py b/wx/py/shell.py index 8c58cc7d..b1ee9248 100755 --- a/wx/py/shell.py +++ b/wx/py/shell.py @@ -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) diff --git a/wx/py/sliceshell.py b/wx/py/sliceshell.py index 618d2e42..32b6e632 100755 --- a/wx/py/sliceshell.py +++ b/wx/py/sliceshell.py @@ -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)