From c5a9a2ea137256e8e02f838f1dd1097c5bfe7657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 29 Oct 2009 12:31:02 +0000 Subject: [PATCH] * This should fix the GCC4 build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33826 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DefaultDecorator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/servers/app/DefaultDecorator.cpp b/src/servers/app/DefaultDecorator.cpp index a1316a2368..0a61e58cdd 100644 --- a/src/servers/app/DefaultDecorator.cpp +++ b/src/servers/app/DefaultDecorator.cpp @@ -572,7 +572,7 @@ DefaultDecorator::_SnapWindowFromSettings(const char* label, if (window == fWindow) continue; - char* debugSuffix = "... NOT!"; + const char* debugSuffix = "... NOT!"; if (window != NULL) { // There can be cases where the other window to which this @@ -1625,7 +1625,7 @@ void DefaultDecorator::HighlightBorders(bool active, BRegion* dirty) { if (active) { - fFrameColors = fHighlightFrameColors; + memcpy(fFrameColors, fHighlightFrameColors, sizeof(fFrameColors)); } else if (IsFocus()) { fFrameColors[0] = fNonHighlightFrameColors[0]; fFrameColors[1] = fNonHighlightFrameColors[1];