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

Workaround a crash bug; real solution as yet unknown

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-06-18 07:41:24 +00:00
parent 9ad19a2bde
commit 3b13683cad
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/stc/scintilla/src/Editor.cxx
View File

@@ -1,6 +1,7 @@
// Scintilla source code edit control // Scintilla source code edit control
/** @file Editor.cxx /** @file Editor.cxx
** Main code for the edit control. ** Main code for the edit control.
Last change: JS 18 Jun 103 1:08 am
**/ **/
// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed. // The License.txt file describes the conditions under which this software may be distributed.
@@ -2353,6 +2354,11 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
} }
} }
// Workaround by JACS: sometimes due to a re-entry condition,
// pixmapLine becomes uninitialised, followed by a crash.
if (!pixmapLine->Initialised())
return;
PRectangle rcRightMargin = rcClient; PRectangle rcRightMargin = rcClient;
rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
if (rcArea.Intersects(rcRightMargin)) { if (rcArea.Intersects(rcRightMargin)) {

6
src/stc/scintilla/src/Editor.cxx
View File

@@ -1,6 +1,7 @@
// Scintilla source code edit control // Scintilla source code edit control
/** @file Editor.cxx /** @file Editor.cxx
** Main code for the edit control. ** Main code for the edit control.
Last change: JS 18 Jun 103 1:08 am
**/ **/
// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
// The License.txt file describes the conditions under which this software may be distributed. // The License.txt file describes the conditions under which this software may be distributed.
@@ -2353,6 +2354,11 @@ void Editor::Paint(Surface *surfaceWindow, PRectangle rcArea) {
} }
} }
// Workaround by JACS: sometimes due to a re-entry condition,
// pixmapLine becomes uninitialised, followed by a crash.
if (!pixmapLine->Initialised())
return;
PRectangle rcRightMargin = rcClient; PRectangle rcRightMargin = rcClient;
rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth; rcRightMargin.left = rcRightMargin.right - vs.rightMarginWidth;
if (rcArea.Intersects(rcRightMargin)) { if (rcArea.Intersects(rcRightMargin)) {