From 57d8f1d980ee019fbec621b67ef2672a094a7404 Mon Sep 17 00:00:00 2001 From: Phil Greenway Date: Sun, 20 Jul 2003 03:47:34 +0000 Subject: [PATCH] Various bug fixes. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4025 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/prefs/devices/Devices.cpp | 2 +- src/prefs/devices/DevicesViews.h | 3 ++- src/prefs/devices/DevicesWindow.cpp | 6 +++--- src/prefs/devices/DevicesWindows.h | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/prefs/devices/Devices.cpp b/src/prefs/devices/Devices.cpp index 5edb01fb8d..e014613da7 100644 --- a/src/prefs/devices/Devices.cpp +++ b/src/prefs/devices/Devices.cpp @@ -35,7 +35,7 @@ DevicesWindow *ptrDevicesWindow; Devices::Devices() : BApplication (APP_SIGNATURE) { // Default Window Size - even though we centre the form to the current screen size - BRect screenFrame = (BScreen(B_MAIN_SCREEN_ID).Frame()); + //BRect screenFrame = (BScreen(B_MAIN_SCREEN_ID).Frame()); float FormTopDefault = 0; float FormLeftDefault = 0; diff --git a/src/prefs/devices/DevicesViews.h b/src/prefs/devices/DevicesViews.h index 73fcd20100..8dafefd1ce 100644 --- a/src/prefs/devices/DevicesViews.h +++ b/src/prefs/devices/DevicesViews.h @@ -16,7 +16,7 @@ class DevicesView : public BView { public: DevicesView(BRect frame); - virtual void Draw(BRect updateRect); + virtual void Draw(BRect updateRect); }; @@ -27,3 +27,4 @@ class ResourceUsageView : public BView }; #endif + diff --git a/src/prefs/devices/DevicesWindow.cpp b/src/prefs/devices/DevicesWindow.cpp index c6965cdae4..e54f81a512 100644 --- a/src/prefs/devices/DevicesWindow.cpp +++ b/src/prefs/devices/DevicesWindow.cpp @@ -108,14 +108,14 @@ void DevicesWindow::InitWindow(void) // Add File menu to menu bar FileMenu = new BMenu("File"); - FileMenu->AddItem(new BMenuItem("About Devices" B_UTF8_ELLIPSIS, new BMessage(MENU_FILE_ABOUT_DEVICES), NULL)); + FileMenu->AddItem(new BMenuItem("About Devices" B_UTF8_ELLIPSIS, new BMessage(MENU_FILE_ABOUT_DEVICES), 0)); FileMenu->AddSeparatorItem(); FileMenu->AddItem(new BMenuItem("Quit", new BMessage(MENU_FILE_QUIT), 'Q')); DevicesMenu = new BMenu("Devices"); JumperedDevicesMenu = new BMenu("New Jumpered Device"); - JumperedDevicesMenu->AddItem(new BMenuItem("Custom ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM), NULL)); - JumperedDevicesMenu->AddItem(new BMenuItem("Modem ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM), NULL)); + JumperedDevicesMenu->AddItem(new BMenuItem("Custom ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_CUSTOM), 0)); + JumperedDevicesMenu->AddItem(new BMenuItem("Modem ...", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE_MODEM), 0)); //DevicesMenu->AddItem(new BMenuItem("New Jumpered Device", new BMessage(MENU_DEVICES_NEW_JUMPERED_DEVICE), NULL)); DevicesMenu->AddItem(JumperedDevicesMenu); diff --git a/src/prefs/devices/DevicesWindows.h b/src/prefs/devices/DevicesWindows.h index ac75c09873..465805063e 100644 --- a/src/prefs/devices/DevicesWindows.h +++ b/src/prefs/devices/DevicesWindows.h @@ -13,6 +13,7 @@ Devices Windows Header by Sikosis #include "DevicesViews.h" class DevicesView; +class ResourceUsageView; class DevicesWindow : public BWindow { @@ -48,3 +49,4 @@ class ResourceUsageWindow : public BWindow #endif +