From 5a7d86b46e47ed80dc8d6a2a8c06f8658e91de05 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 20 May 2020 02:19:24 +0200 Subject: [PATCH] Make ScrollBarArrowFrame C++03 compatible --- SourceX/DiabloUI/diabloui.cpp | 4 ++-- SourceX/DiabloUI/scrollbar.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SourceX/DiabloUI/diabloui.cpp b/SourceX/DiabloUI/diabloui.cpp index f7466e648..2570623d1 100644 --- a/SourceX/DiabloUI/diabloui.cpp +++ b/SourceX/DiabloUI/diabloui.cpp @@ -693,12 +693,12 @@ void Render(const UiScrollBar &ui_sb) // Arrows: { const SDL_Rect rect = UpArrowRect(ui_sb); - const int frame = static_cast(scrollBarState.upArrowPressed ? ScrollBarArrowFrame::UP_ACTIVE : ScrollBarArrowFrame::UP); + const int frame = static_cast(scrollBarState.upArrowPressed ? ScrollBarArrowFrame_UP_ACTIVE : ScrollBarArrowFrame_UP); DrawArt(rect.x, rect.y, ui_sb.arrow, frame, rect.w); } { const SDL_Rect rect = DownArrowRect(ui_sb); - const int frame = static_cast(scrollBarState.downArrowPressed ? ScrollBarArrowFrame::DOWN_ACTIVE : ScrollBarArrowFrame::DOWN); + const int frame = static_cast(scrollBarState.downArrowPressed ? ScrollBarArrowFrame_DOWN_ACTIVE : ScrollBarArrowFrame_DOWN); DrawArt(rect.x, rect.y, ui_sb.arrow, frame, rect.w); } diff --git a/SourceX/DiabloUI/scrollbar.h b/SourceX/DiabloUI/scrollbar.h index c5f1a3fd6..655392116 100644 --- a/SourceX/DiabloUI/scrollbar.h +++ b/SourceX/DiabloUI/scrollbar.h @@ -9,11 +9,11 @@ extern Art ArtScrollBarBackground; const Uint16 SCROLLBAR_BG_WIDTH = 25; extern Art ArtScrollBarArrow; -enum class ScrollBarArrowFrame { - UP_ACTIVE = 0, - UP, - DOWN_ACTIVE, - DOWN, +enum ScrollBarArrowFrame { + ScrollBarArrowFrame_UP_ACTIVE = 0, + ScrollBarArrowFrame_UP, + ScrollBarArrowFrame_DOWN_ACTIVE, + ScrollBarArrowFrame_DOWN, }; extern Art ArtScrollBarThumb;