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

Merge pull request #1850 from wxWidgets/fix-issue1841

Browse Source 
Check for existing mouse capture before doing a capture/release
This commit is contained in:
Robin Dunn
2020-11-18 18:13:00 -08:00
committed by GitHub
parent e4bd88b0d9 1a8d0fa9bb
commit 6f9b1fb153
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wx/lib/gridmovers.py
View File

@@ -324,12 +324,14 @@ class GridColMover(wx.EvtHandler):
colImg = self._CaptureImage(rect)
self.colWin = ColDragWindow(self.grid,colImg,col)
self.colWin.Show(False)
self.lwin.CaptureMouse()
if wx.Window.GetCapture() is not None:
self.lwin.CaptureMouse()
evt.Skip()
def OnRelease(self,evt):
if self.isDragging:
self.lwin.ReleaseMouse()
if self.lwin.HasCapture():
self.lwin.ReleaseMouse()
self.colWin.Show(False)
self.isDragging = False
@@ -465,12 +467,14 @@ class GridRowMover(wx.EvtHandler):
rowImg = self._CaptureImage(rect)
self.rowWin = RowDragWindow(self.grid,rowImg,row)
self.rowWin.Show(False)
self.lwin.CaptureMouse()
if wx.Window.GetCapture() is not None:
self.lwin.CaptureMouse()
evt.Skip()
def OnRelease(self,evt):
if self.isDragging:
self.lwin.ReleaseMouse()
if self.lwin.HasCapture():
self.lwin.ReleaseMouse()
self.rowWin.Show(False)
self.isDragging = False