Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* This should fix the GCC4 build.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33826 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-10-29 12:31:02 +00:00
parent b43e064ecc
commit c5a9a2ea13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/servers/app/DefaultDecorator.cpp
View File

@ -572,7 +572,7 @@ DefaultDecorator::_SnapWindowFromSettings(const char* label,
if (window == fWindow) if (window == fWindow)
continue; continue;
char* debugSuffix = "... NOT!"; const char* debugSuffix = "... NOT!";
if (window != NULL) { if (window != NULL) {
// There can be cases where the other window to which this // There can be cases where the other window to which this
@ -1625,7 +1625,7 @@ void
DefaultDecorator::HighlightBorders(bool active, BRegion* dirty) DefaultDecorator::HighlightBorders(bool active, BRegion* dirty)
{ {
if (active) { if (active) {
fFrameColors = fHighlightFrameColors; memcpy(fFrameColors, fHighlightFrameColors, sizeof(fFrameColors));
} else if (IsFocus()) { } else if (IsFocus()) {
fFrameColors[0] = fNonHighlightFrameColors[0]; fFrameColors[0] = fNonHighlightFrameColors[0];
fFrameColors[1] = fNonHighlightFrameColors[1]; fFrameColors[1] = fNonHighlightFrameColors[1];