Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Screen: fixed a warning and gcc2 build.

Browse Source
This commit is contained in:
Jerome Duval 2012-03-31 10:41:35 +02:00
parent a300055ed7
commit 0efb8b6639
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/preferences/screen/ScreenWindow.cpp
View File

@ -310,15 +310,14 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
fRefreshMenu = new BPopUpMenu("refresh rate", true, true); fRefreshMenu = new BPopUpMenu("refresh rate", true, true);
BMessage *message;
float min, max; float min, max;
if (fScreenMode.GetRefreshLimits(fActive, min, max) && min == max) { if (fScreenMode.GetRefreshLimits(fActive, min, max) && min == max) {
// This is a special case for drivers that only support a single // This is a special case for drivers that only support a single
// frequency, like the VESA driver // frequency, like the VESA driver
BString name; BString name;
refresh_rate_to_string(min, 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); item->SetEnabled(false);
} else { } else {
monitor_info info; monitor_info info;
@ -334,16 +333,14 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
BString name; BString name;
name << kRefreshRates[i] << " " << B_TRANSLATE("Hz"); name << kRefreshRates[i] << " " << B_TRANSLATE("Hz");
message = new BMessage(POP_REFRESH_MSG); BMessage *message = new BMessage(POP_REFRESH_MSG);
message->AddFloat("refresh", kRefreshRates[i]); message->AddFloat("refresh", kRefreshRates[i]);
fRefreshMenu->AddItem(new BMenuItem(name.String(), message)); fRefreshMenu->AddItem(new BMenuItem(name.String(), message));
} }
message = new BMessage(POP_OTHER_REFRESH_MSG);
fOtherRefresh = new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS), fOtherRefresh = new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS),
message); new BMessage(POP_OTHER_REFRESH_MSG));
fRefreshMenu->AddItem(fOtherRefresh); fRefreshMenu->AddItem(fOtherRefresh);
} }
@ -372,7 +369,7 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
true, true); true, true);
for (int32 i = 0; i < kCombineModeCount; i++) { 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); message->AddInt32("mode", kCombineModes[i].mode);
fCombineMenu->AddItem(new BMenuItem(kCombineModes[i].name, fCombineMenu->AddItem(new BMenuItem(kCombineModes[i].name,
@ -389,7 +386,7 @@ ScreenWindow::ScreenWindow(ScreenSettings* settings)
true, true); true, true);
// !order is important - we rely that boolean value == idx // !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); message->AddBool("swap", false);
fSwapDisplaysMenu->AddItem(new BMenuItem(B_TRANSLATE("no"), message)); fSwapDisplaysMenu->AddItem(new BMenuItem(B_TRANSLATE("no"), message));