Don't use a wxPopupWindow on wxGTK

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

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index b35314aba43a3654e7ccc8fe84ee5f542984704a..5a256340edffe8d62a9b5b6474e5bb6a445fee7c 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -63,6 +63,11 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

+#ifdef __WXGTK__
+#undef wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0
+#endif
+

 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index b35314aba43a3654e7ccc8fe84ee5f542984704a..5a256340edffe8d62a9b5b6474e5bb6a445fee7c 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -63,6 +63,11 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

+#ifdef __WXGTK__
+#undef wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0
+#endif
+

 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow