pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

THTMLPort: Fix crash with predefined color "darkyellow"

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4378 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-10-21 17:36:37 +00:00
parent 3e0fabe544
commit c56df7ad62
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/thtmlport/demo_src/framedem.compiled
View File

@ -1,5 +0,0 @@
<?xml version="1.0"?>
<CONFIG>
<Compiler Value="/usr/local/bin/ppcppc" Date="1238925281"/>
<Params Value=" -MDelphi -Sa -Cirot -O1 -gl -k-framework -kCarbon -k-framework -kOpenGL -k'-dylib_file' -k'/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' -WG -vewnhi -l -Fu../../../lazarus/components/printers/lib/powerpc-darwin/carbon/ -Fu../package/units/powerpc-darwin/ -Fu../../../lazarus/ideintf/units/powerpc-darwin/ -Fu../../../lazarus/lcl/units/powerpc-darwin/ -Fu../../../lazarus/lcl/units/powerpc-darwin/carbon/ -Fu../../../lazarus/packager/units/powerpc-darwin/ -Fu. -oframedem -dDebugIt -dLCL -dLCLcarbon framedem.dpr"/>
</CONFIG>

5
components/thtmlport/demo_src/htmldemo.compiled
View File

@ -1,5 +0,0 @@
<?xml version="1.0"?>
<CONFIG>
<Compiler Value="/usr/local/bin/ppcppc" Date="1238925281"/>
<Params Value=" -MDelphi -Sa -Cirot -O1 -gl -k-framework -kCarbon -k-framework -kOpenGL -k'-dylib_file' -k'/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' -WG -vewnhi -l -Fu../../../lazarus/components/printers/lib/powerpc-darwin/carbon/ -Fu../package/units/powerpc-darwin/ -Fu../../../lazarus/ideintf/units/powerpc-darwin/ -Fu../../../lazarus/lcl/units/powerpc-darwin/ -Fu../../../lazarus/lcl/units/powerpc-darwin/carbon/ -Fu../../../lazarus/packager/units/powerpc-darwin/ -Fu. -ohtmldemo -dDebugIt -dLCL -dLCLcarbon htmldemo.dpr"/>
</CONFIG>

9
components/thtmlport/package/styleun.pas
View File

@ -2344,7 +2344,7 @@ for HIndex := 1 to 6 do
end; end;
const const
NumColors = 176; NumColors = 177; //176;
Colors: array[1..NumColors] of string[20] = ('transparent', Colors: array[1..NumColors] of string[20] = ('transparent',
'black', 'maroon', 'green', 'olive', 'navy', 'purple', 'teal', 'gray', 'black', 'maroon', 'green', 'olive', 'navy', 'purple', 'teal', 'gray',
'silver', 'red', 'lime', 'yellow', 'blue', 'fuchsia', 'aqua', 'white', 'silver', 'red', 'lime', 'yellow', 'blue', 'fuchsia', 'aqua', 'white',
@ -2374,6 +2374,8 @@ const
'steelblue', 'tan', 'thistle', 'tomato', 'turquoise', 'steelblue', 'tan', 'thistle', 'tomato', 'turquoise',
'violet', 'wheat', 'whitesmoke', 'yellowgreen', 'violet', 'wheat', 'whitesmoke', 'yellowgreen',
'darkyellow',
'grey', 'darkgrey', 'darkslategrey', 'dimgrey', 'lightgrey', 'lightslategrey', 'slategrey', 'grey', 'darkgrey', 'darkslategrey', 'dimgrey', 'lightgrey', 'lightslategrey', 'slategrey',
'background', 'activecaption', 'inactivecaption', 'menu', 'window', 'background', 'activecaption', 'inactivecaption', 'menu', 'window',
'windowframe', 'menutext', 'windowtext', 'captiontext', 'activeborder', 'windowframe', 'menutext', 'windowtext', 'captiontext', 'activeborder',
@ -2410,7 +2412,10 @@ const
$EBCE87, $CD5A6A, $908070, $FAFAFF, $7FFF00, $EBCE87, $CD5A6A, $908070, $FAFAFF, $7FFF00,
$B48246, $8CB4D2, $D8BFD8, $4763FF, $D0E040, $B48246, $8CB4D2, $D8BFD8, $4763FF, $D0E040,
$EE82EE, $B3DEF5, $F5F5F5, $32CD9A, $EE82EE, $B3DEF5, $F5F5F5, $32CD9A,
clgray, $A9A9A9, $4F4F2F, $696969, $D3D3D3, $998877, $908070,
$008080, // added
clgray, $A9A9A9, $4F4F2F, $696969, $D3D3D3, $998877, $908070,
clBackground, clActiveCaption, clInactiveCaption, clMenu, clWindow, clBackground, clActiveCaption, clInactiveCaption, clMenu, clWindow,
clWindowFrame, clMenuText, clWindowText, clCaptionText, clActiveBorder, clWindowFrame, clMenuText, clWindowText, clCaptionText, clActiveBorder,
clInactiveBorder, clAppWorkSpace, clHighlight, clHighlightText, clBtnFace, clInactiveBorder, clAppWorkSpace, clHighlight, clHighlightText, clBtnFace,