From adb5963fbd2416ff9a003833e5d68ce6cf7b4336 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 30 Nov 2011 02:44:27 +0000 Subject: [PATCH] Cast size_ts used in format strings to ints instead as there isn't actually a portable way to format them. Originally committed to SVN as r5944. --- aegisub/src/dialog_translation.cpp | 4 +--- aegisub/src/menu.cpp | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/aegisub/src/dialog_translation.cpp b/aegisub/src/dialog_translation.cpp index 41baf598f..fad9d4924 100644 --- a/aegisub/src/dialog_translation.cpp +++ b/aegisub/src/dialog_translation.cpp @@ -41,8 +41,6 @@ #include "video_context.h" #ifndef AGI_PRE -#include - #include #include #include @@ -207,7 +205,7 @@ bool DialogTranslation::PrevBlock() { } void DialogTranslation::UpdateDisplay() { - line_number_display->SetLabel(wxString::Format(_("Current line: %" PRIu64 "/%" PRIu64), line_number, line_count)); + line_number_display->SetLabel(wxString::Format(_("Current line: %d/%d"), (int)line_number, (int)line_count)); original_text->SetReadOnly(false); original_text->ClearAll(); diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp index 8be8902a0..fe347e090 100644 --- a/aegisub/src/menu.cpp +++ b/aegisub/src/menu.cpp @@ -38,7 +38,6 @@ #ifndef AGI_PRE #include -#include #include #include @@ -74,7 +73,7 @@ class MruMenu : public wxMenu { for (size_t i = GetMenuItemCount(); i < new_size; ++i) { if (i >= items.size()) { items.push_back(new wxMenuItem(this, MENU_ID_BASE + cmds->size(), "_")); - cmds->push_back(cmd::get(STD_STR(wxString::Format("recent/%s/%" PRIu64, lagi_wxString(type).Lower(), i)))); + cmds->push_back(cmd::get(STD_STR(wxString::Format("recent/%s/%d", lagi_wxString(type).Lower(), (int)i)))); } Append(items[i]); }