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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 21dbf1774a408460292ee5dcf36171ad798eb680..a6f5fa3652b3b38889dc684b7b0d69be7e3ef779 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3907,6 +3907,8 @@ void wxWindowGTK::DoReleaseMouse()
 
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
+    g_captureWindow = (wxWindowGTK*) NULL;
+
     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;
@@ -3917,7 +3919,6 @@ void wxWindowGTK::DoReleaseMouse()
         return;
 
     gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
-    g_captureWindow = (wxWindowGTK*) NULL;
 }
 
 /* static */

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 21dbf1774a408460292ee5dcf36171ad798eb680..a6f5fa3652b3b38889dc684b7b0d69be7e3ef779 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -3907,6 +3907,8 @@ void wxWindowGTK::DoReleaseMouse()
 
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
+    g_captureWindow = (wxWindowGTK*) NULL;
+
     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;
@@ -3917,7 +3919,6 @@ void wxWindowGTK::DoReleaseMouse()
         return;
 
     gdk_pointer_ungrab ( (guint32)GDK_CURRENT_TIME );
-    g_captureWindow = (wxWindowGTK*) NULL;
 }
 
 /* static */