Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem with CaptureMouse if cursor is null.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-20 10:53:04 +00:00
parent dae167759c
commit cca602accb
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -3422,6 +3422,10 @@ void wxWindow::CaptureMouse()
if (!window) return; if (!window) return;
wxCursor* cursor = & m_cursor;
if (!cursor->Ok())
cursor = wxSTANDARD_CURSOR;
gdk_pointer_grab( window, FALSE, gdk_pointer_grab( window, FALSE,
(GdkEventMask) (GdkEventMask)
(GDK_BUTTON_PRESS_MASK | (GDK_BUTTON_PRESS_MASK |
@@ -3429,7 +3433,7 @@ void wxWindow::CaptureMouse()
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_POINTER_MOTION_MASK), GDK_POINTER_MOTION_MASK),
(GdkWindow *) NULL, (GdkWindow *) NULL,
m_cursor.GetCursor(), cursor->GetCursor(),
(guint32)GDK_CURRENT_TIME ); (guint32)GDK_CURRENT_TIME );
g_captureWindow = this; g_captureWindow = this;
} }

6
src/gtk1/window.cpp
View File

@@ -3422,6 +3422,10 @@ void wxWindow::CaptureMouse()
if (!window) return; if (!window) return;
wxCursor* cursor = & m_cursor;
if (!cursor->Ok())
cursor = wxSTANDARD_CURSOR;
gdk_pointer_grab( window, FALSE, gdk_pointer_grab( window, FALSE,
(GdkEventMask) (GdkEventMask)
(GDK_BUTTON_PRESS_MASK | (GDK_BUTTON_PRESS_MASK |
@@ -3429,7 +3433,7 @@ void wxWindow::CaptureMouse()
GDK_POINTER_MOTION_HINT_MASK | GDK_POINTER_MOTION_HINT_MASK |
GDK_POINTER_MOTION_MASK), GDK_POINTER_MOTION_MASK),
(GdkWindow *) NULL, (GdkWindow *) NULL,
m_cursor.GetCursor(), cursor->GetCursor(),
(guint32)GDK_CURRENT_TIME ); (guint32)GDK_CURRENT_TIME );
g_captureWindow = this; g_captureWindow = this;
} }