aboutsummaryrefslogtreecommitdiff
path: root/backends/PalmOS/Src/forms
diff options
context:
space:
mode:
authorChris Apers2004-05-25 13:56:11 +0000
committerChris Apers2004-05-25 13:56:11 +0000
commitc6b29924652d261ac3fb1c8c7200c576ec219d3c (patch)
tree2467a32744167582b86f13505a8e07a4b9aa28fd /backends/PalmOS/Src/forms
parent9f40696ff337dff36e2d36ffe8c5258be3e6b47f (diff)
downloadscummvm-rg350-c6b29924652d261ac3fb1c8c7200c576ec219d3c.tar.gz
scummvm-rg350-c6b29924652d261ac3fb1c8c7200c576ec219d3c.tar.bz2
scummvm-rg350-c6b29924652d261ac3fb1c8c7200c576ec219d3c.zip
Updated forms
svn-id: r13874
Diffstat (limited to 'backends/PalmOS/Src/forms')
-rw-r--r--backends/PalmOS/Src/forms/formSystem.cpp2
-rw-r--r--backends/PalmOS/Src/forms/formmain.cpp12
-rw-r--r--backends/PalmOS/Src/forms/forms.h5
3 files changed, 7 insertions, 12 deletions
diff --git a/backends/PalmOS/Src/forms/formSystem.cpp b/backends/PalmOS/Src/forms/formSystem.cpp
index 1e94a311b8..20703c7408 100644
--- a/backends/PalmOS/Src/forms/formSystem.cpp
+++ b/backends/PalmOS/Src/forms/formSystem.cpp
@@ -82,7 +82,7 @@ static void SystemInfoFormInit() {
frmP = FrmGetActiveForm();
FrmDrawForm(frmP);
- WinSetTextColor(255);
+ WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground));
FntSetFont(stdFont);
StrIToA(num, dm);
diff --git a/backends/PalmOS/Src/forms/formmain.cpp b/backends/PalmOS/Src/forms/formmain.cpp
index bfcd1cd368..1adf489985 100644
--- a/backends/PalmOS/Src/forms/formmain.cpp
+++ b/backends/PalmOS/Src/forms/formmain.cpp
@@ -5,6 +5,7 @@
#include "skin.h"
#include "games.h"
#include "scumm_globals.h"
+#include "globals.h"
#include "stdafx.h"
#include "version.h"
@@ -106,13 +107,8 @@ static Boolean MainFormDoCommand(UInt16 command)
handled = true;
break;
- case MainOptionsVolumeControl:
- FrmPopupForm(VolumeForm);
- handled = true;
- break;
-
- case MainOptionsMusic:
- FrmPopupForm(SoundForm);
+ case MainOptionsMusicSound:
+ FrmPopupForm(MusicForm);
handled = true;
break;
@@ -122,7 +118,7 @@ static Boolean MainFormDoCommand(UInt16 command)
break;
case MainOptionsMisc:
- FrmPopupForm(MiscOptionsForm);
+ FrmPopupForm(MiscForm);
handled = true;
break;
}
diff --git a/backends/PalmOS/Src/forms/forms.h b/backends/PalmOS/Src/forms/forms.h
index edc54e76b0..e0d0f8ec25 100644
--- a/backends/PalmOS/Src/forms/forms.h
+++ b/backends/PalmOS/Src/forms/forms.h
@@ -12,11 +12,10 @@
HANDLER(Main)
HANDLER(EditGame)
-HANDLER(Volume)
HANDLER(SystemInfo)
-HANDLER(Sound)
-HANDLER(MiscOptions)
+HANDLER(Misc)
HANDLER(CardSlot)
HANDLER(Skins)
+HANDLER(Music)
#endif