Build fix. These lines otherwise trigger unused variable errors on gcc4.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42994 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
5b264395c0
commit
b50f9c8616
|
@ -58,6 +58,18 @@ All rights reserved.
|
||||||
|
|
||||||
#define ROSTER_SIG "application/x-vnd.Be-ROST"
|
#define ROSTER_SIG "application/x-vnd.Be-ROST"
|
||||||
|
|
||||||
|
|
||||||
|
// One of them is used if HAIKU_DISTRO_COMPATIBILITY_OFFICIAL, and the other if
|
||||||
|
// not. However, we want both of them to end up in the catalog, so we have to
|
||||||
|
// put them outside of the ifdef block.
|
||||||
|
static const char* skSuspendMenuItemStr = B_TRANSLATE_MARK("Suspend");
|
||||||
|
static const char* skAboutHaikuMenuItemStr = B_TRANSLATE_MARK(
|
||||||
|
"About Haiku");
|
||||||
|
static const char* skAboutThisSystemMenuItemStr = B_TRANSLATE_MARK(
|
||||||
|
"About this system");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef MOUNT_MENU_IN_DESKBAR
|
#ifdef MOUNT_MENU_IN_DESKBAR
|
||||||
|
|
||||||
class DeskbarMountMenu : public BPrivate::MountMenu {
|
class DeskbarMountMenu : public BPrivate::MountMenu {
|
||||||
|
@ -244,19 +256,11 @@ TBeMenu::AddStandardBeMenuItems()
|
||||||
AddSeparatorItem();
|
AddSeparatorItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
// One of them is used if HAIKU_DISTRO_COMPATIBILITY_OFFICIAL, and the other if
|
|
||||||
// not. However, we want both of them to end up in the catalog, so we have to
|
|
||||||
// put them outside of the ifdef block.
|
|
||||||
static const char* kAboutHaikuMenuItemStr = B_TRANSLATE_MARK(
|
|
||||||
"About Haiku");
|
|
||||||
static const char* kAboutThisSystemMenuItemStr = B_TRANSLATE_MARK(
|
|
||||||
"About this system");
|
|
||||||
|
|
||||||
item = new BMenuItem(
|
item = new BMenuItem(
|
||||||
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
|
#ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL
|
||||||
B_TRANSLATE_NOCOLLECT(kAboutHaikuMenuItemStr)
|
B_TRANSLATE_NOCOLLECT(skAboutHaikuMenuItemStr)
|
||||||
#else
|
#else
|
||||||
B_TRANSLATE_NOCOLLECT(kAboutThisSystemMenuItemStr)
|
B_TRANSLATE_NOCOLLECT(skAboutThisSystemMenuItemStr)
|
||||||
#endif
|
#endif
|
||||||
, new BMessage(kShowSplash));
|
, new BMessage(kShowSplash));
|
||||||
item->SetEnabled(!dragging);
|
item->SetEnabled(!dragging);
|
||||||
|
@ -305,11 +309,9 @@ TBeMenu::AddStandardBeMenuItems()
|
||||||
item->SetEnabled(!dragging);
|
item->SetEnabled(!dragging);
|
||||||
shutdownMenu->AddItem(item);
|
shutdownMenu->AddItem(item);
|
||||||
|
|
||||||
// String outside of ifdef block for collectcatkeys purposes
|
|
||||||
static const char* kSuspendMenuItemStr = B_TRANSLATE_MARK("Suspend");
|
|
||||||
#ifdef APM_SUPPORT
|
#ifdef APM_SUPPORT
|
||||||
if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
|
if (_kapm_control_(APM_CHECK_ENABLED) == B_OK) {
|
||||||
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(kSuspendMenuItemStr),
|
item = new BMenuItem(B_TRANSLATE_NOCOLLECT(skSuspendMenuItemStr),
|
||||||
new BMessage(kSuspendSystem));
|
new BMessage(kSuspendSystem));
|
||||||
item->SetEnabled(!dragging);
|
item->SetEnabled(!dragging);
|
||||||
shutdownMenu->AddItem(item);
|
shutdownMenu->AddItem(item);
|
||||||
|
|
Loading…
Reference in New Issue