Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for OSX crash in STC’s CallTip popup. Revert this when the fix in #15765 is backported.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2013-12-29 03:36:41 +00:00
parent ee2868c9ff
commit 2886c0fdba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/stc/ScintillaWX.cpp
View File

@@ -32,6 +32,7 @@
#include "wx/dataobj.h" #include "wx/dataobj.h"
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include "wx/dnd.h" #include "wx/dnd.h"
#include "wx/frame.h"
#if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING #if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING
#include "wx/beforestd.h" #include "wx/beforestd.h"
@@ -91,7 +92,6 @@ void wxSTCDropTarget::OnLeave() {
#include "wx/popupwin.h" #include "wx/popupwin.h"
#define wxSTCCallTipBase wxPopupWindow #define wxSTCCallTipBase wxPopupWindow
#else #else
#include "wx/frame.h"
#define wxSTCCallTipBase wxFrame #define wxSTCCallTipBase wxFrame
#endif #endif
@@ -101,7 +101,13 @@ class wxSTCCallTip : public wxSTCCallTipBase {
public: public:
wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) : wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
#if wxUSE_POPUPWIN #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 #else
wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
wxFRAME_NO_TASKBAR wxFRAME_NO_TASKBAR