From 66746d151f98ab54641bc33f1b70c2474f38460c Mon Sep 17 00:00:00 2001 From: Twisted Pair in my Hair Date: Tue, 31 May 2016 18:40:10 +0300 Subject: [PATCH] GTK: make some dubious implicit type conversions explicit. --- src/platform/gtkmain.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/platform/gtkmain.cpp b/src/platform/gtkmain.cpp index b7c5078..3d1f9ef 100644 --- a/src/platform/gtkmain.cpp +++ b/src/platform/gtkmain.cpp @@ -384,7 +384,7 @@ public: in absolute sizes; modify_font does on GTK2. */ Pango::FontDescription override_font_desc(font_desc); double dpi = get_screen()->get_resolution(); - override_font_desc.set_size(font_height * 72.0 / dpi * Pango::SCALE); + override_font_desc.set_size(font_height * (int)(72.0 / dpi) * Pango::SCALE); _entry.override_font(override_font_desc); #else _entry.modify_font(font_desc); @@ -472,11 +472,11 @@ private: /* Graphics window */ -int DeltaYOfScrollEvent(GdkEventScroll *event) { +double DeltaYOfScrollEvent(GdkEventScroll *event) { #ifdef HAVE_GTK3 - int delta_y = event->delta_y; + double delta_y = event->delta_y; #else - int delta_y = 0; + double delta_y = 0; #endif if(delta_y == 0) { switch(event->direction) { @@ -575,7 +575,7 @@ protected: int x, y; ij_to_xy(event->x, event->y, x, y); - SS.GW.MouseScroll(x, y, -DeltaYOfScrollEvent(event)); + SS.GW.MouseScroll(x, y, (int)-DeltaYOfScrollEvent(event)); return true; } @@ -1047,7 +1047,7 @@ static void RefreshRecentMenu(Command cmd, Command base) { placeholder->set_sensitive(false); menu->append(*placeholder); } else { - for(int i = 0; i < MAX_RECENT; i++) { + for(size_t i = 0; i < MAX_RECENT; i++) { if(std::string(RecentFile[i]).empty()) break;