From 2886c0fdba6722ffb32448470c8f20ef2f7a69f9 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 29 Dec 2013 03:36:41 +0000 Subject: [PATCH] =?UTF-8?q?Workaround=20for=20OSX=20crash=20in=20STC?= =?UTF-8?q?=E2=80=99s=20CallTip=20popup.=20=20Revert=20this=20when=20the?= =?UTF-8?q?=20fix=20in=20#15765=20is=20backported.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/stc/ScintillaWX.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 503e05ea37..c529caad8a 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -32,6 +32,7 @@ #include "wx/dataobj.h" #include "wx/clipbrd.h" #include "wx/dnd.h" +#include "wx/frame.h" #if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING #include "wx/beforestd.h" @@ -91,7 +92,6 @@ void wxSTCDropTarget::OnLeave() { #include "wx/popupwin.h" #define wxSTCCallTipBase wxPopupWindow #else -#include "wx/frame.h" #define wxSTCCallTipBase wxFrame #endif @@ -101,7 +101,13 @@ class wxSTCCallTip : public wxSTCCallTipBase { public: wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) : #if wxUSE_POPUPWIN - wxSTCCallTipBase(parent, wxBORDER_NONE), + wxSTCCallTipBase(parent, wxBORDER_NONE +#ifdef __WXMAC__ + // Workaround to avoid crash on OSX. Remove when the fix lands in wx. + // See ticket #15765 + | wxFRAME_TOOL_WINDOW +#endif + ), #else wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxFRAME_NO_TASKBAR