From 80d2f0a0abffb4a4af188c339a2e8d978da5c072 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Thu, 13 Oct 2016 15:23:12 +1100 Subject: [PATCH] Revert GUI1 multimenu part of 07e993ce3e322 This cased issues when building with Clang, and this file will be dropped post-1.13.6 anyway. --- src/widgets/multimenu.cpp | 4 ++-- src/widgets/multimenu.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/multimenu.cpp b/src/widgets/multimenu.cpp index 2104fe5e9097..a749b1fcdf44 100644 --- a/src/widgets/multimenu.cpp +++ b/src/widgets/multimenu.cpp @@ -22,11 +22,11 @@ namespace gui { menu(video, items, click_selects, max_height, max_width, sorter_obj, menu_style, auto_join), active_items_(items.size(), false) {} - void multimenu::draw_row(const size_t row_index, SDL_Rect &rect, menu::ROW_TYPE type) { + void multimenu::draw_row(const size_t row_index, const SDL_Rect &rect, menu::ROW_TYPE type) { surface img = image::get_image(active_items_[row_index] ? "buttons/checkbox-pressed.png" : "buttons/checkbox.png"); - sdl_blit(img, nullptr, video().getSurface(), &rect); + blit_surface(img, nullptr, video().getSurface(), &rect); SDL_Rect newrect = { Sint16 (rect.x + img->w + 2), rect.y, diff --git a/src/widgets/multimenu.hpp b/src/widgets/multimenu.hpp index ff20590ba620..1112b7deabcf 100644 --- a/src/widgets/multimenu.hpp +++ b/src/widgets/multimenu.hpp @@ -62,7 +62,7 @@ namespace gui { int last_changed(); protected: - virtual void draw_row(const size_t row_index, SDL_Rect& rect, ROW_TYPE type); + virtual void draw_row(const size_t row_index, const SDL_Rect& rect, ROW_TYPE type); virtual void handle_event(const SDL_Event& event); /**