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

(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

View File

@@ -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