[haiku-commits] haiku: hrev43911 - src/preferences/screen
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 31 Mar 2012 10:46:17 +0200 (CEST)
hrev43911 adds 1 changeset to branch 'master'
old head: a300055ed7f0be4af0781ecbf0a2328a112ebe1a
new head: 0efb8b6639094b6c57724aadc24c1bdf06ac9b3b
----------------------------------------------------------------------------
0efb8b6: Screen: fixed a warning and gcc2 build.
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev43911
Commit: 0efb8b6639094b6c57724aadc24c1bdf06ac9b3b
URL: http://cgit.haiku-os.org/haiku/commit/?id=0efb8b6
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Sat Mar 31 08:41:35 2012 UTC
----------------------------------------------------------------------------
1 files changed, 6 insertions(+), 9 deletions(-)
src/preferences/screen/ScreenWindow.cpp | 15 ++++++---------
----------------------------------------------------------------------------
diff --git a/src/preferences/screen/ScreenWindow.cpp
b/src/preferences/screen/ScreenWindow.cpp
index 7e5b295..c094a0b 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -310,15 +310,14 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
fRefreshMenu = new BPopUpMenu("refresh rate", true, true);
- BMessage *message;
-
float min, max;
if (fScreenMode.GetRefreshLimits(fActive, min, max) && min == max) {
// This is a special case for drivers that only support a single
// frequency, like the VESA driver
BString name;
refresh_rate_to_string(min, name);
- fRefreshMenu->AddItem(item = new BMenuItem(name.String(),
message));
+ BMenuItem *item = new BMenuItem(name.String(), NULL);
+ fRefreshMenu->AddItem(item);
item->SetEnabled(false);
} else {
monitor_info info;
@@ -334,16 +333,14 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
BString name;
name << kRefreshRates[i] << " " << B_TRANSLATE("Hz");
- message = new BMessage(POP_REFRESH_MSG);
+ BMessage *message = new BMessage(POP_REFRESH_MSG);
message->AddFloat("refresh", kRefreshRates[i]);
fRefreshMenu->AddItem(new BMenuItem(name.String(),
message));
}
- message = new BMessage(POP_OTHER_REFRESH_MSG);
-
fOtherRefresh = new BMenuItem(B_TRANSLATE("Other"
B_UTF8_ELLIPSIS),
- message);
+ new BMessage(POP_OTHER_REFRESH_MSG));
fRefreshMenu->AddItem(fOtherRefresh);
}
@@ -372,7 +369,7 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
true, true);
for (int32 i = 0; i < kCombineModeCount; i++) {
- message = new BMessage(POP_COMBINE_DISPLAYS_MSG);
+ BMessage *message = new
BMessage(POP_COMBINE_DISPLAYS_MSG);
message->AddInt32("mode", kCombineModes[i].mode);
fCombineMenu->AddItem(new
BMenuItem(kCombineModes[i].name,
@@ -389,7 +386,7 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
true, true);
// !order is important - we rely that boolean value == idx
- message = new BMessage(POP_SWAP_DISPLAYS_MSG);
+ BMessage *message = new BMessage(POP_SWAP_DISPLAYS_MSG);
message->AddBool("swap", false);
fSwapDisplaysMenu->AddItem(new BMenuItem(B_TRANSLATE("no"),
message));
Other related posts:
- » [haiku-commits] haiku: hrev43911 - src/preferences/screen - korli
