make sure gs_captureWindow is always set to NULL in DoReleaseMouse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3907,6 +3907,8 @@ void wxWindowGTK::DoReleaseMouse()
|
|||||||
|
|
||||||
wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
|
wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
|
||||||
|
|
||||||
|
g_captureWindow = (wxWindowGTK*) NULL;
|
||||||
|
|
||||||
GdkWindow *window = (GdkWindow*) NULL;
|
GdkWindow *window = (GdkWindow*) NULL;
|
||||||
if (m_wxwindow)
|
if (m_wxwindow)
|
||||||
window = GTK_PIZZA(m_wxwindow)->bin_window;
|
window = GTK_PIZZA(m_wxwindow)->bin_window;
|
||||||
@@ -3917,7 +3919,6 @@ void wxWindowGTK::DoReleaseMouse()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
|
gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
|
||||||
g_captureWindow = (wxWindowGTK*) NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
|
@@ -3907,6 +3907,8 @@ void wxWindowGTK::DoReleaseMouse()
|
|||||||
|
|
||||||
wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
|
wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
|
||||||
|
|
||||||
|
g_captureWindow = (wxWindowGTK*) NULL;
|
||||||
|
|
||||||
GdkWindow *window = (GdkWindow*) NULL;
|
GdkWindow *window = (GdkWindow*) NULL;
|
||||||
if (m_wxwindow)
|
if (m_wxwindow)
|
||||||
window = GTK_PIZZA(m_wxwindow)->bin_window;
|
window = GTK_PIZZA(m_wxwindow)->bin_window;
|
||||||
@@ -3917,7 +3919,6 @@ void wxWindowGTK::DoReleaseMouse()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
|
gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
|
||||||
g_captureWindow = (wxWindowGTK*) NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
|
Reference in New Issue
Block a user