Fixed problem with CaptureMouse if cursor is null.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dae167759c
commit
cca602accb
@ -3422,6 +3422,10 @@ void wxWindow::CaptureMouse()
|
||||
|
||||
if (!window) return;
|
||||
|
||||
wxCursor* cursor = & m_cursor;
|
||||
if (!cursor->Ok())
|
||||
cursor = wxSTANDARD_CURSOR;
|
||||
|
||||
gdk_pointer_grab( window, FALSE,
|
||||
(GdkEventMask)
|
||||
(GDK_BUTTON_PRESS_MASK |
|
||||
@ -3429,7 +3433,7 @@ void wxWindow::CaptureMouse()
|
||||
GDK_POINTER_MOTION_HINT_MASK |
|
||||
GDK_POINTER_MOTION_MASK),
|
||||
(GdkWindow *) NULL,
|
||||
m_cursor.GetCursor(),
|
||||
cursor->GetCursor(),
|
||||
(guint32)GDK_CURRENT_TIME );
|
||||
g_captureWindow = this;
|
||||
}
|
||||
|
@ -3422,6 +3422,10 @@ void wxWindow::CaptureMouse()
|
||||
|
||||
if (!window) return;
|
||||
|
||||
wxCursor* cursor = & m_cursor;
|
||||
if (!cursor->Ok())
|
||||
cursor = wxSTANDARD_CURSOR;
|
||||
|
||||
gdk_pointer_grab( window, FALSE,
|
||||
(GdkEventMask)
|
||||
(GDK_BUTTON_PRESS_MASK |
|
||||
@ -3429,7 +3433,7 @@ void wxWindow::CaptureMouse()
|
||||
GDK_POINTER_MOTION_HINT_MASK |
|
||||
GDK_POINTER_MOTION_MASK),
|
||||
(GdkWindow *) NULL,
|
||||
m_cursor.GetCursor(),
|
||||
cursor->GetCursor(),
|
||||
(guint32)GDK_CURRENT_TIME );
|
||||
g_captureWindow = this;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user