Switch back to not using wxPopupWindow since wxMSW's version can't

handle it...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index 712c3b818fdba7dfbfd5cfd311ed86e3f5e89abe..35d5fc08772f01b96a2d80073503321ad30f7e3c 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -701,8 +701,8 @@ END_EVENT_TABLE()
 
 
 
-// #undef  wxSTC_USE_POPUP
-// #define wxSTC_USE_POPUP 0
+#undef  wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0  // wxPopupWindow just doesn't work well in this case...
 
 // A window to place the listbox upon.  If wxPopupWindow is supported then
 // that will be used so the listbox can extend beyond the client area of the

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 2cc5c6d876175d8511d4425c420d2af087f7cc19..5e3d95b65a799ce0b8155fb27bbc3d0d9ff39a7c 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -110,7 +110,7 @@ public:
             CaptureMouse();
         }
         else {
-            ReleaseMouse();
+            if (HasCapture()) ReleaseMouse();
         }
         return retval;
     }

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 712c3b818fdba7dfbfd5cfd311ed86e3f5e89abe..35d5fc08772f01b96a2d80073503321ad30f7e3c 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -701,8 +701,8 @@ END_EVENT_TABLE()
 
 
 
-// #undef  wxSTC_USE_POPUP
-// #define wxSTC_USE_POPUP 0
+#undef  wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0  // wxPopupWindow just doesn't work well in this case...
 
 // A window to place the listbox upon.  If wxPopupWindow is supported then
 // that will be used so the listbox can extend beyond the client area of the

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 2cc5c6d876175d8511d4425c420d2af087f7cc19..5e3d95b65a799ce0b8155fb27bbc3d0d9ff39a7c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -110,7 +110,7 @@ public:
             CaptureMouse();
         }
         else {
-            ReleaseMouse();
+            if (HasCapture()) ReleaseMouse();
         }
         return retval;
     }