diff --git a/wx/lib/agw/flatmenu.py b/wx/lib/agw/flatmenu.py index 5c667014..69bc6547 100644 --- a/wx/lib/agw/flatmenu.py +++ b/wx/lib/agw/flatmenu.py @@ -6153,8 +6153,8 @@ class FlatMenu(FlatMenuBase): if win.GetClientRect().Contains(p): - event.m_x = p.x - event.m_y = p.y + event.SetX(p.x) + event.SetY(p.y) win.OnMouseLeftUp(event) return diff --git a/wx/lib/gridmovers.py b/wx/lib/gridmovers.py index d3abd35d..810211b5 100644 --- a/wx/lib/gridmovers.py +++ b/wx/lib/gridmovers.py @@ -334,7 +334,7 @@ class GridColMover(wx.EvtHandler): col = self.grid.XToCol(px+sx) if col != wx.NOT_FOUND: - self.grid.SelectCol(col,evt.m_controlDown) + self.grid.SelectCol(col,evt.ControlDown()) return else: @@ -462,7 +462,7 @@ class GridRowMover(wx.EvtHandler): row = self.grid.YToRow(py + sy) if row != wx.NOT_FOUND: - self.grid.SelectRow(row,evt.m_controlDown) + self.grid.SelectRow(row,evt.ControlDown()) return else: bRow = self.rowWin.GetInsertionRow() diff --git a/wx/lib/pubsub/core/topicutils.py b/wx/lib/pubsub/core/topicutils.py index 9fe32d76..bfb10744 100644 --- a/wx/lib/pubsub/core/topicutils.py +++ b/wx/lib/pubsub/core/topicutils.py @@ -48,7 +48,7 @@ class TopicNameInvalid(RuntimeError): import re -_validNameRE = re.compile(r'[a-zA-Z]\w*') +_validNameRE = re.compile(r'[-0-9a-zA-Z]\w*') def validateName(topicName):