From c198d57c3ab2c040fb85dc19309d23b28b20cf51 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 6 Jun 2002 18:36:03 +0000 Subject: [PATCH] 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 --- contrib/src/stc/PlatWX.cpp | 4 ++-- contrib/src/stc/ScintillaWX.cpp | 2 +- src/stc/PlatWX.cpp | 4 ++-- src/stc/ScintillaWX.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp index 712c3b818f..35d5fc0877 100644 --- 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 2cc5c6d876..5e3d95b65a 100644 --- 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 712c3b818f..35d5fc0877 100644 --- 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 2cc5c6d876..5e3d95b65a 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -110,7 +110,7 @@ public: CaptureMouse(); } else { - ReleaseMouse(); + if (HasCapture()) ReleaseMouse(); } return retval; } -- 2.45.2