From b1534fc0e8dc4009b0080e8b7c7241c4d03d2eb6 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Tue, 2 Nov 2010 02:22:29 +0000 Subject: [PATCH] Build fixes mostly due to usage of a translation macro that isn't (currently) available in the source tree. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39267 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/showimage/ImageFileNavigator.h | 2 +- src/apps/showimage/ShowImageWindow.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/apps/showimage/ImageFileNavigator.h b/src/apps/showimage/ImageFileNavigator.h index e0331e2629..f5c92338e1 100644 --- a/src/apps/showimage/ImageFileNavigator.h +++ b/src/apps/showimage/ImageFileNavigator.h @@ -72,7 +72,7 @@ public: private: bool _IsImage(const entry_ref& ref); bool _FindNextImage(const entry_ref& current, - entry_ref& next, bool next, + entry_ref& ref, bool next, bool rewind); status_t _LoadNextImage(bool next, bool rewind); void _SetTrackerSelectionToCurrent(); diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index 941af6ff49..fdc1212a3c 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -126,6 +126,10 @@ bs_printf(BString* string, const char* format, ...) // #pragma mark -- ShowImageWindow +#undef B_TRANSLATE_CONTEXT +#define B_TRANSLATE_CONTEXT "Menus" + + ShowImageWindow::ShowImageWindow(const entry_ref* ref, const BMessenger& trackerMessenger) : @@ -201,7 +205,7 @@ ShowImageWindow::ShowImageWindow(const entry_ref* ref, } // add View menu here so it can access ShowImageView methods - BMenu* menu = new BMenu(B_TRANSLATE_WITH_CONTEXT("View", "Menus")); + BMenu* menu = new BMenu(B_TRANSLATE("View")); _BuildViewMenu(menu, false); fBar->AddItem(menu); @@ -891,10 +895,9 @@ ShowImageWindow::_LoadError(const entry_ref& ref) { // TODO: give a better error message! BAlert* alert = new BAlert(B_TRANSLATE("ShowImage"), - B_TRANSLATE_WITH_CONTEXT("Could not load image! Either the " - "file or an image translator for it does not exist.", - "LoadAlerts"), - B_TRANSLATE_WITH_CONTEXT("OK", "Alerts"), NULL, NULL, + B_TRANSLATE("Could not load image! Either the " + "file or an image translator for it does not exist."), + B_TRANSLATE("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT); alert->Go(); }