[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/forms formtabs.cpp,1.2,1.2.2.1 formtabs.h,1.2,1.2.2.1

[Chris Apers]

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

Modified Files:
      Tag: branch-0-7-0
	formtabs.cpp formtabs.h 
Log Message:
Use a draw function instead of a preinit one

Index: formtabs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formtabs.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- formtabs.cpp	9 Nov 2004 11:06:39 -0000	1.2
+++ formtabs.cpp	20 Dec 2004 18:37:11 -0000	1.2.2.1
@@ -26,7 +26,7 @@
 	delete tabP;
 }
 
-Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *preInit) {
+Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc) {
 	FormType *srcP;
 	UInt16 cnt;
 	void *objP, **dstP;
@@ -38,10 +38,6 @@
 	dstP = (void **)frmP;
 	srcP = FrmInitForm(rscID);
 
-	if (preInit) {
-		preInit(srcP);
-	}
-
 	objNum = FrmGetNumberOfObjects(srcP);
 
 	// save tab data
@@ -52,6 +48,7 @@
 	tabP->tabs[tabP->count].srcP	= srcP;
 	tabP->tabs[tabP->count].first	= FrmGetObjectId(srcP, 0);
 	tabP->tabs[tabP->count].last	= FrmGetObjectId(srcP, objNum - 1);
+	tabP->tabs[tabP->count].drawFunc= drawFunc;
 	tabP->count++;
 	tabP->active = tabP->count;
 
@@ -169,6 +166,8 @@
 	WinSetForeColor(UIColorGetTableEntryIndex(UIFormFill));
 	WinDrawLine(1, 14, 154,14);
 	WinDrawLine(1, 15, 154,15);
+	RctSetRectangle(&r, 1, 30, 154, 100);
+	WinDrawRectangle(&r, 0);
 	WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame));
 	WinDrawLine(1, 28, 154,28);
 
@@ -199,6 +198,9 @@
 	}
 
 	// show objects
+	if (dataP->drawFunc)
+		(dataP->drawFunc)();
+
 	for (cnt = dataP->first; cnt <= dataP->last; cnt++) {
 		if ((idx = FrmGetObjectIndex(frmP, cnt)) != frmInvalidObjectId)
 			FrmShowObject(frmP, idx);

Index: formtabs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formtabs.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- formtabs.h	9 Nov 2004 11:06:40 -0000	1.2
+++ formtabs.h	20 Dec 2004 18:37:11 -0000	1.2.2.1
@@ -1,10 +1,13 @@
 #ifndef __FORMTABS_H__
 #define __FORMTABS_H__
 
+typedef void (TabProc)();
+
 typedef struct {
 	FormPtr srcP;
 	UInt16 first;
 	UInt16 last;
+	TabProc *drawFunc;
 } TabDataType, *TabDataPtr;
 
 typedef struct {
@@ -13,11 +16,9 @@
 	TabDataPtr tabs;
 } TabType, *TabPtr;
 
-typedef void (TabProc)(FormType *);
-
 TabType	*TabNewTabs		(UInt16 cnt);
 void 	 TabDeleteTabs	(TabType *tabP);
-Err 	 TabAddContent	(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *preInit = 0);
+Err 	 TabAddContent	(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *drawFunc = 0);
 void 	 TabSetActive	(FormType *frmP, TabType *tabP, UInt16 num);
 
-#endif
\ No newline at end of file
+#endif