From e53da927089798e08e868d839cc30e31f072f8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 19 Jun 2011 18:13:21 +0000 Subject: [PATCH] Part of patch from #6840: * GCC 4.5 complains about switchs with cases not part of the window_look enum (see WindowPrivate.h). * To keep them private, cast the enum to int before use in switchs. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42250 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/decorators/BeDecorator/BeDecorator.cpp | 8 ++++---- src/add-ons/decorators/SATDecorator/SATDecorator.cpp | 2 +- src/servers/app/DefaultDecorator.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/add-ons/decorators/BeDecorator/BeDecorator.cpp b/src/add-ons/decorators/BeDecorator/BeDecorator.cpp index 2c39148c80..87828d1407 100644 --- a/src/add-ons/decorators/BeDecorator/BeDecorator.cpp +++ b/src/add-ons/decorators/BeDecorator/BeDecorator.cpp @@ -260,7 +260,7 @@ BeDecorator::_DoLayout() bool hasTab = false; - switch (Look()) { + switch ((int)Look()) { case B_MODAL_WINDOW_LOOK: fBorderWidth = 5; break; @@ -422,7 +422,7 @@ BeDecorator::_DrawFrame(BRect invalid) // Draw the border frame BRect r = BRect(fTopBorder.LeftTop(), fBottomBorder.RightBottom()); - switch (fLook) { + switch ((int)fLook) { case B_TITLED_WINDOW_LOOK: case B_DOCUMENT_WINDOW_LOOK: case B_MODAL_WINDOW_LOOK: @@ -533,7 +533,7 @@ BeDecorator::_DrawFrame(BRect invalid) if (!(fFlags & B_NOT_RESIZABLE)) { r = fResizeRect; - switch (fLook) { + switch ((int)fLook) { case B_DOCUMENT_WINDOW_LOOK: { if (!invalid.Intersects(r)) @@ -877,7 +877,7 @@ BeDecorator::_ResizeBy(BPoint pt, BRegion* dirty) // Handle invalidation of resize rect if (dirty && !(fFlags & B_NOT_RESIZABLE)) { BRect realResizeRect; - switch (fLook) { + switch ((int)fLook) { case B_DOCUMENT_WINDOW_LOOK: realResizeRect = fResizeRect; // Resize rect at old location diff --git a/src/add-ons/decorators/SATDecorator/SATDecorator.cpp b/src/add-ons/decorators/SATDecorator/SATDecorator.cpp index c31d73911e..f049def54e 100644 --- a/src/add-ons/decorators/SATDecorator/SATDecorator.cpp +++ b/src/add-ons/decorators/SATDecorator/SATDecorator.cpp @@ -119,7 +119,7 @@ SATDecorator::_DoLayout() bool hasTab = false; - switch (Look()) { + switch ((int)Look()) { case B_MODAL_WINDOW_LOOK: fBorderWidth = 5; break; diff --git a/src/servers/app/DefaultDecorator.cpp b/src/servers/app/DefaultDecorator.cpp index d0eccfb46a..ea6840e85a 100644 --- a/src/servers/app/DefaultDecorator.cpp +++ b/src/servers/app/DefaultDecorator.cpp @@ -350,7 +350,7 @@ DefaultDecorator::_DoLayout() bool hasTab = false; - switch (Look()) { + switch ((int)Look()) { case B_MODAL_WINDOW_LOOK: fBorderWidth = 5; break; @@ -511,7 +511,7 @@ DefaultDecorator::_DrawFrame(BRect invalid) // Draw the border frame BRect r = BRect(fTopBorder.LeftTop(), fBottomBorder.RightBottom()); - switch (fLook) { + switch ((int)fLook) { case B_TITLED_WINDOW_LOOK: case B_DOCUMENT_WINDOW_LOOK: case B_MODAL_WINDOW_LOOK: @@ -655,7 +655,7 @@ DefaultDecorator::_DrawFrame(BRect invalid) ComponentColors colors; _GetComponentColors(COMPONENT_RESIZE_CORNER, colors); - switch (fLook) { + switch ((int)fLook) { case B_DOCUMENT_WINDOW_LOOK: { if (!invalid.Intersects(r)) @@ -989,7 +989,7 @@ DefaultDecorator::_ResizeBy(BPoint offset, BRegion* dirty) // Handle invalidation of resize rect if (dirty && !(fFlags & B_NOT_RESIZABLE)) { BRect realResizeRect; - switch (fLook) { + switch ((int)fLook) { case B_DOCUMENT_WINDOW_LOOK: realResizeRect = fResizeRect; // Resize rect at old location