gcc4 build fix by Maxime Simon. Resolves ticket #3786. Thanks!
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30241 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
e451292ccd
commit
a7e67ab3f2
@ -33,6 +33,7 @@
|
||||
#include <MessageFilter.h>
|
||||
|
||||
// headers PreferencesWindow
|
||||
#include <Application.h>
|
||||
#include <GroupView.h>
|
||||
#include <Screen.h>
|
||||
#include <SpaceLayoutItem.h>
|
||||
@ -375,14 +376,14 @@ PreferencesWindow<Preferences>::MessageReceived(BMessage *msg)
|
||||
break;
|
||||
|
||||
case kDefaultMsg:
|
||||
Defaults();
|
||||
PreferencesStorage<Preferences>::Defaults();
|
||||
fRevertButton->SetEnabled(true);
|
||||
if (fPreferencesView)
|
||||
PostMessage(kDefaultMsg, fPreferencesView);
|
||||
break;
|
||||
|
||||
case kRevertMsg:
|
||||
Revert();
|
||||
PreferencesStorage<Preferences>::Revert();
|
||||
fRevertButton->SetEnabled(false);
|
||||
if (fPreferencesView)
|
||||
PostMessage(kRevertMsg, fPreferencesView);
|
||||
@ -425,7 +426,7 @@ template<typename Preferences>
|
||||
void
|
||||
PreferencesWindow<Preferences>::_MoveToPosition()
|
||||
{
|
||||
BPoint position = WindowPosition();
|
||||
BPoint position = PreferencesStorage<Preferences>::WindowPosition();
|
||||
// center window on screen if it had a bad position
|
||||
if(position.x < 0 && position.y < 0){
|
||||
BRect rect = BScreen().Frame();
|
||||
|
@ -339,7 +339,7 @@ FrequencyMenu::UpdateMenu()
|
||||
|
||||
|
||||
StatusView::StatusView(BRect frame, bool inDeskbar,
|
||||
PreferencesStorage<freq_preferences>* storage = NULL)
|
||||
PreferencesStorage<freq_preferences>* storage)
|
||||
: BView(frame, kDeskbarItemName, B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
||||
B_WILL_DRAW | B_FRAME_EVENTS),
|
||||
fInDeskbar(inDeskbar),
|
||||
@ -600,7 +600,7 @@ StatusView::ResizeToPreferred(void)
|
||||
|
||||
|
||||
void
|
||||
StatusView::ShowPopUpMenu(bool show = true)
|
||||
StatusView::ShowPopUpMenu(bool show)
|
||||
{
|
||||
fShowPopUpMenu = show;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user