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

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 03:08:01 CET 2004


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

Modified Files:
	formtabs.cpp formtabs.h 
Log Message:
Added pre-init capability

Index: formtabs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formtabs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- formtabs.cpp	25 May 2004 13:53:59 -0000	1.1
+++ formtabs.cpp	9 Nov 2004 11:06:39 -0000	1.2
@@ -26,7 +26,7 @@
 	delete tabP;
 }
 
-Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID) {
+Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *preInit) {
 	FormType *srcP;
 	UInt16 cnt;
 	void *objP, **dstP;
@@ -37,6 +37,11 @@
 	
 	dstP = (void **)frmP;
 	srcP = FrmInitForm(rscID);
+
+	if (preInit) {
+		preInit(srcP);
+	}
+
 	objNum = FrmGetNumberOfObjects(srcP);
 
 	// save tab data
@@ -49,7 +54,7 @@
 	tabP->tabs[tabP->count].last	= FrmGetObjectId(srcP, objNum - 1);
 	tabP->count++;
 	tabP->active = tabP->count;
-	
+
 	// create tab
 	FntSetFont(stdFont);
 	x = 4 + tabP->width;
@@ -124,6 +129,13 @@
 				FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
 				break;
 			}
+
+			case frmBitmapObj: {
+/*				UInt16 family = id + 1;
+				FrmNewBitmap((FormType **)dstP, id, id, x, y);
+				//FrmHideObject((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));
+*/				break;
+			}
 		}
 	}
 

Index: formtabs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/forms/formtabs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- formtabs.h	25 May 2004 13:53:59 -0000	1.1
+++ formtabs.h	9 Nov 2004 11:06:40 -0000	1.2
@@ -13,9 +13,11 @@
 	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);
+Err 	 TabAddContent	(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscID, TabProc *preInit = 0);
 void 	 TabSetActive	(FormType *frmP, TabType *tabP, UInt16 num);
 
 #endif
\ No newline at end of file





More information about the Scummvm-git-logs mailing list