[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/forms formSystem.cpp,1.3,1.4 formmain.cpp,1.2,1.3 forms.h,1.2,1.3

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5992

Modified Files:
	formSystem.cpp formmain.cpp forms.h 
Log Message:
Updated forms

Index: formSystem.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formSystem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- formSystem.cpp	2 Dec 2003 11:12:02 -0000	1.3
+++ formSystem.cpp	25 May 2004 13:56:11 -0000	1.4
@@ -82,7 +82,7 @@
 	frmP = FrmGetActiveForm();
 	FrmDrawForm(frmP);
 
-	WinSetTextColor(255);
+	WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground));
 	FntSetFont(stdFont);
 	
 	StrIToA(num, dm);

Index: formmain.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formmain.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- formmain.cpp	13 Feb 2004 11:26:33 -0000	1.2
+++ formmain.cpp	25 May 2004 13:56:11 -0000	1.3
@@ -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 @@
  			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 @@
 			break;
 
 		case MainOptionsMisc:
-			FrmPopupForm(MiscOptionsForm);
+			FrmPopupForm(MiscForm);
 			handled = true;
 			break;
 		}

Index: forms.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/forms.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- forms.h	5 Feb 2004 14:20:51 -0000	1.2
+++ forms.h	25 May 2004 13:56:11 -0000	1.3
@@ -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