i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc4 build fix by Maxime Simon. Resolves ticket #3786. Thanks!

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30241 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2009-04-18 16:58:28 +00:00
parent e451292ccd
commit a7e67ab3f2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/cpufrequency/PreferencesWindow.h
+4 -3
View File
@@ -33,6 +33,7 @@
#include <MessageFilter.h> #include <MessageFilter.h>
// headers PreferencesWindow // headers PreferencesWindow
#include <Application.h>
#include <GroupView.h> #include <GroupView.h>
#include <Screen.h> #include <Screen.h>
#include <SpaceLayoutItem.h> #include <SpaceLayoutItem.h>
@@ -375,14 +376,14 @@ PreferencesWindow<Preferences>::MessageReceived(BMessage *msg)
break; break;
case kDefaultMsg: case kDefaultMsg:
Defaults(); PreferencesStorage<Preferences>::Defaults();
fRevertButton->SetEnabled(true); fRevertButton->SetEnabled(true);
if (fPreferencesView) if (fPreferencesView)
PostMessage(kDefaultMsg, fPreferencesView); PostMessage(kDefaultMsg, fPreferencesView);
break; break;
case kRevertMsg: case kRevertMsg:
Revert(); PreferencesStorage<Preferences>::Revert();
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
if (fPreferencesView) if (fPreferencesView)
PostMessage(kRevertMsg, fPreferencesView); PostMessage(kRevertMsg, fPreferencesView);
@@ -425,7 +426,7 @@ template<typename Preferences>
void void
PreferencesWindow<Preferences>::_MoveToPosition() PreferencesWindow<Preferences>::_MoveToPosition()
{ {
BPoint position = WindowPosition(); BPoint position = PreferencesStorage<Preferences>::WindowPosition();
// center window on screen if it had a bad position // center window on screen if it had a bad position
if(position.x < 0 && position.y < 0){ if(position.x < 0 && position.y < 0){
BRect rect = BScreen().Frame(); BRect rect = BScreen().Frame();
src/preferences/cpufrequency/StatusView.cpp
+2 -2
View File
@@ -339,7 +339,7 @@ FrequencyMenu::UpdateMenu()
StatusView::StatusView(BRect frame, bool inDeskbar, StatusView::StatusView(BRect frame, bool inDeskbar,
PreferencesStorage<freq_preferences>* storage = NULL) PreferencesStorage<freq_preferences>* storage)
: BView(frame, kDeskbarItemName, B_FOLLOW_LEFT | B_FOLLOW_TOP, : BView(frame, kDeskbarItemName, B_FOLLOW_LEFT | B_FOLLOW_TOP,
B_WILL_DRAW | B_FRAME_EVENTS), B_WILL_DRAW | B_FRAME_EVENTS),
fInDeskbar(inDeskbar), fInDeskbar(inDeskbar),
@@ -600,7 +600,7 @@ StatusView::ResizeToPreferred(void)
void void
StatusView::ShowPopUpMenu(bool show = true) StatusView::ShowPopUpMenu(bool show)
{ {
fShowPopUpMenu = show; fShowPopUpMenu = show;
} }