diff options
Diffstat (limited to 'backends/PalmOS/Src/forms')
| -rw-r--r-- | backends/PalmOS/Src/forms/formCards.cpp | 20 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formEditGame.cpp | 34 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formMisc.cpp | 10 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formSkins.cpp | 26 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/forminfo.cpp | 10 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formmain.cpp | 30 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formmusic.cpp | 32 | ||||
| -rw-r--r-- | backends/PalmOS/Src/forms/formtabs.cpp | 24 | 
8 files changed, 93 insertions, 93 deletions
diff --git a/backends/PalmOS/Src/forms/formCards.cpp b/backends/PalmOS/Src/forms/formCards.cpp index 5afcaa41ea..c4d1e2cdf6 100644 --- a/backends/PalmOS/Src/forms/formCards.cpp +++ b/backends/PalmOS/Src/forms/formCards.cpp @@ -57,13 +57,13 @@ static UInt16 CardSlotFormInit(Boolean display, Boolean bDraw) {  			if (err || StrLen(labelP) == 0) {	// if no label try to retreive card type  				VolumeInfoType volInfo;  				err = VFSVolumeInfo(volRefNum, &volInfo); -				 +  				if (!err) {  					ExpCardInfoType info;  					err = ExpCardInfo(volInfo.slotRefNum, &info);  					StrCopy(labelP, info.deviceClassStr);  				} -				 +  				if (err)	// if err default name  					StrPrintF(labelP,"Other Card %ld", other++);  			} @@ -72,7 +72,7 @@ static UInt16 CardSlotFormInit(Boolean display, Boolean bDraw) {  				cards = MemHandleNew(sizeof(CardInfoType));  			else  				MemHandleResize(cards, MemHandleSize(cards) + sizeof(CardInfoType)); -				 +  			cardsInfo = (CardInfoType *)MemHandleLock(cards);  			cardsInfo[counter].volRefNum = volRefNum;  			StrCopy(cardsInfo[counter].nameP, labelP); @@ -87,7 +87,7 @@ static UInt16 CardSlotFormInit(Boolean display, Boolean bDraw) {  		ControlType *cck1P, *cck2P, *cck3P;  		UInt16 index;  		Int16 selected = -1; -		 +  		CardInfoType *cardsInfo;  		MemHandle items = NULL; @@ -108,7 +108,7 @@ static UInt16 CardSlotFormInit(Boolean display, Boolean bDraw) {  				itemsText = (Char **)MemHandleLock(items);  				itemsText[index] = cardsInfo[index].nameP;  				MemHandleUnlock(items); -				 +  				if (cardsInfo[index].volRefNum == gPrefs->card.volRefNum)  					selected = index;  			} @@ -168,7 +168,7 @@ static void CardSlotFormExit(Boolean bSave) {  		cardsInfo = (CardInfoType *)itemsList;  		cards = MemPtrRecoverHandle(cardsInfo);  		items = MemPtrRecoverHandle(itemsText); -	 +  		itemsText = NULL;  		itemsList = NULL;  	} else { @@ -239,7 +239,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) {  	Boolean handled = false;  	switch (eventP->eType) { -	 +  		case frmOpenEvent:  			CardSlotFormInit(true, true);  			handled = true; @@ -260,7 +260,7 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) {  				case CardSlotCancelButton:  					CardSlotFormExit(false);  					break; -				 +  				case CardSlotMoveCheckbox:  					CardSlotFromShowHideOptions();  					break; @@ -271,13 +271,13 @@ Boolean CardSlotFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  }  UInt16 parseCards() {  	UInt16 volRefNum = CardSlotFormInit(false, false);  	CardSlotFormExit(false); -	 +  	return volRefNum;  } diff --git a/backends/PalmOS/Src/forms/formEditGame.cpp b/backends/PalmOS/Src/forms/formEditGame.cpp index 47e1857160..bcd44c1502 100644 --- a/backends/PalmOS/Src/forms/formEditGame.cpp +++ b/backends/PalmOS/Src/forms/formEditGame.cpp @@ -33,7 +33,7 @@ static void GameTabInit(GameInfoType *gameInfoP) {  	nameP = (Char *)MemHandleLock(nameH);  	pathP = (Char *)MemHandleLock(pathH);  	gameP = (Char *)MemHandleLock(gameH); -	 +  	if (gameInfoP) {  		LstSetSelection(list1P, gameInfoP->engine);  		StrCopy(nameP, gameInfoP->nameP); @@ -102,7 +102,7 @@ static Err GameTabSave(GameInfoType *gameInfoP) {  			StrCat(gameInfoP->pathP, "/");  	} -	 +  	return errNone;  } @@ -110,7 +110,7 @@ static void DisplayInit(GameInfoType *gameInfoP) {  	ListType *list1P;  	list1P = (ListType *)GetObjectPtr(TabGameDisplayGfxListList); -	 +  	if (gameInfoP) {  		LstSetSelection(list1P, gameInfoP->gfxMode);  		CtlSetValue((ControlType *)GetObjectPtr(TabGameDisplayFilterCheckbox), gameInfoP->filter); @@ -129,7 +129,7 @@ static void DisplayInit(GameInfoType *gameInfoP) {  static Err DisplaySave(GameInfoType *gameInfoP) {  	ListType *list1P; -	ControlType *cck6P, *cck7P, *cck8P;	 +	ControlType *cck6P, *cck7P, *cck8P;  	FormType *frmP = FrmGetActiveForm(); @@ -137,7 +137,7 @@ static Err DisplaySave(GameInfoType *gameInfoP) {  	cck6P = (ControlType *)GetObjectPtr(TabGameDisplayFilterCheckbox);  	cck7P = (ControlType *)GetObjectPtr(TabGameDisplayFullscreenCheckbox);  	cck8P = (ControlType *)GetObjectPtr(TabGameDisplayAspectRatioCheckbox); -	 +  	if (!gameInfoP) {  	} else {  		gameInfoP->gfxMode = LstGetSelection(list1P); @@ -145,7 +145,7 @@ static Err DisplaySave(GameInfoType *gameInfoP) {  		gameInfoP->fullscreen = CtlGetValue(cck7P);  		gameInfoP->aspectRatio = CtlGetValue(cck8P);  	} -	 +  	return errNone;  } @@ -213,7 +213,7 @@ static void OptionsInit(GameInfoType *gameInfoP) {  static Err OptionsSave(GameInfoType *gameInfoP) {  	FieldType *fld4P, *fld5P, *fld6P; -	ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P;	 +	ControlType *cck1P, *cck2P, *cck3P, *cck4P, *cck5P;  	ListType *list2P, *list3P;  	FormType *frmP = FrmGetActiveForm(); @@ -247,7 +247,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) {  	} else {  		gameInfoP->language = LstGetSelection(list2P);  		gameInfoP->platform = LstGetSelection(list3P); -		 +  		gameInfoP->autoLoad = CtlGetValue(cck1P);  		gameInfoP->bootParam = CtlGetValue(cck2P);  		gameInfoP->setPlatform = CtlGetValue(cck3P); @@ -258,7 +258,7 @@ static Err OptionsSave(GameInfoType *gameInfoP) {  		gameInfoP->bootValue = StrAToI(FldGetTextPtr(fld5P));  		gameInfoP->talkValue = StrAToI(FldGetTextPtr(fld6P));  	} -	 +  	return errNone;  } @@ -323,19 +323,19 @@ static void GameManSave(UInt16 index) {  		newGameInfo.version	= curItemVersion;  		newGameInfo.icnID = 0xFFFF;  		newGameInfo.selected = true; -		 +  		// default sound data  		newGameInfo.musicInfo.volume.master = 192;  		newGameInfo.musicInfo.volume.music = 192;  		newGameInfo.musicInfo.volume.sfx = 192;  		newGameInfo.musicInfo.volume.speech = 192;  		newGameInfo.musicInfo.volume.audiocd = 50; -		 +  		newGameInfo.musicInfo.sound.tempo = 100;  		newGameInfo.musicInfo.sound.defaultTrackLength = 10;  		newGameInfo.musicInfo.sound.firstTrack = 1;  	} -	 +  	GameTabSave(&newGameInfo);  	DisplaySave(&newGameInfo);  	OptionsSave(&newGameInfo); @@ -349,14 +349,14 @@ static void GameManSave(UInt16 index) {  	{  		RectangleType rArea;  		UInt16 posIndex, maxView; -		 +  		// get the sorted index  		index = GamGetSelected();  		// if new item is out of the list bounds, change current list pos  		SknGetListBounds(&rArea, NULL);  		maxView = rArea.extent.y / sknInfoListItemSize;  		posIndex = gPrefs->listPosition; -		 +  		// if out of the current list position  		if (!(index >= posIndex && index < (posIndex + maxView)))  			gPrefs->listPosition = index;	// this value is corrected in SknUpdateList if needed @@ -373,7 +373,7 @@ static void GameManSave(UInt16 index) {   * FUNCTION:    EditGameFormInit   * FUNCTION:    EditGameFormHandleEvent   * - * DESCRIPTION:  + * DESCRIPTION:   *   * REVISION HISTORY:   * @@ -451,7 +451,7 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) {  					TabDeleteTabs(myTabP);  					FrmReturnToMain();  					break; -				 +  				case GameEditDeleteButton:  					EditGameFormDelete(false);  					break; @@ -482,6 +482,6 @@ Boolean EditGameFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  } diff --git a/backends/PalmOS/Src/forms/formMisc.cpp b/backends/PalmOS/Src/forms/formMisc.cpp index 7622a56185..d720d7bc11 100644 --- a/backends/PalmOS/Src/forms/formMisc.cpp +++ b/backends/PalmOS/Src/forms/formMisc.cpp @@ -29,7 +29,7 @@ static Boolean ScummVMTabSave() {  	FormPtr frmP;  	fld1P = (FieldType *)GetObjectPtr(TabScummVMDebugLevelField); -	 +  	cckP[3] = (ControlType *)GetObjectPtr(TabScummVMDebugCheckbox);  	cckP[6] = (ControlType *)GetObjectPtr(TabScummVMDemoCheckbox);  	cckP[9] = (ControlType *)GetObjectPtr(TabScummVMCopyProtectionCheckbox); @@ -49,7 +49,7 @@ static Boolean ScummVMTabSave() {  	gPrefs->altIntro = CtlGetValue(cckP[10]);  	gPrefs->debugLevel = StrAToI(FldGetTextPtr(fld1P)); -	 +  	return true;  } @@ -125,7 +125,7 @@ static void PalmOSTabInit() {  static void MiscFormSave() {  	PalmOSTabSave();  	if (!ScummVMTabSave()) return; -	 +  	TabDeleteTabs(myTabP);  	FrmReturnToMain();  } @@ -176,7 +176,7 @@ Boolean MiscFormHandleEvent(EventPtr eventP) {  				case (MiscForm + 2) :  					lastTab = (eventP->data.ctlSelect.controlID - MiscForm - 1);  					TabSetActive(frmP, myTabP, lastTab); -					 +  #ifndef DISABLE_LIGHTSPEED  					if (!LS_Installed())  #endif @@ -210,6 +210,6 @@ Boolean MiscFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  } diff --git a/backends/PalmOS/Src/forms/formSkins.cpp b/backends/PalmOS/Src/forms/formSkins.cpp index 3eddfe79ad..b4c1e222d0 100644 --- a/backends/PalmOS/Src/forms/formSkins.cpp +++ b/backends/PalmOS/Src/forms/formSkins.cpp @@ -27,7 +27,7 @@ static void SkinsFormInit(Boolean bDraw) {  	Char nameP[32];  	itemsText = NULL; -	 +  	// parse and save skins  	Err err = DmGetNextDatabaseByTypeCreator(true, &stateInfo, 'skin', appFileCreator, false, &cardNo, &dbID);  	while (!err && dbID) { @@ -38,14 +38,14 @@ static void SkinsFormInit(Boolean bDraw) {  				skins = MemHandleNew(sizeof(SkinInfoType));  			else  				MemHandleResize(skins, MemHandleSize(skins) + sizeof(SkinInfoType)); -			 +  			skinsInfo = (SkinInfoType *)MemHandleLock(skins);  			StrCopy(skinsInfo[numSkins].nameP, nameP);  			skinsInfo[numSkins].cardNo = cardNo;  			skinsInfo[numSkins].dbID = dbID;  			MemHandleUnlock(skins);  			numSkins++; -		}		 +		}  		err = DmGetNextDatabaseByTypeCreator(false, &stateInfo, 'skin', appFileCreator, false, &cardNo, &dbID);  	} @@ -69,7 +69,7 @@ static void SkinsFormInit(Boolean bDraw) {  		itemsText = (Char **)MemHandleLock(items);  		itemsText[index] = skinsInfo[index].nameP;  		MemHandleUnlock(items); -		 +  		if (	gPrefs->skin.cardNo == skinsInfo[index].cardNo &&  				gPrefs->skin.dbID == skinsInfo[index].dbID &&  				StrCompare(gPrefs->skin.nameP, skinsInfo[index].nameP) == 0) @@ -106,7 +106,7 @@ static void SkinsFormExit(Boolean bSave) {  	listP = (ListType *)GetObjectPtr(SkinsSkinList);  	selected = LstGetSelection(listP); -	 +  	if (bSave && selected == -1)	{	// may never occured...  		FrmCustomAlert(FrmWarnAlert, "You didn't select a skin.", 0, 0);  		return; @@ -115,24 +115,24 @@ static void SkinsFormExit(Boolean bSave) {  	skinsInfo = (SkinInfoType *)itemsList;  	skins = MemPtrRecoverHandle(skinsInfo);  	items = MemPtrRecoverHandle(itemsText); -	 +  	itemsText = NULL;  	itemsList = NULL;  	itemsType = ITEM_TYPE_UNKNOWN;  	if (bSave) {  		ControlType *cck1P; -	 +  		StrCopy(gPrefs->skin.nameP, skinsInfo[selected].nameP);  		gPrefs->skin.cardNo = skinsInfo[selected].cardNo;  		gPrefs->skin.dbID =  skinsInfo[selected].dbID; -		 +  /*		DmOpenRef skinDB = SknOpenSkin();  		UInt32 depth = SknGetDepth(skinDB);  		SknCloseSkin(skinDB);  		if (depth != 8 && depth != 16) depth = 8; -		 +  		if (depth == 16 && !OPTIONS_TST(kOptMode16Bit)) {  			FrmCustomAlert(FrmInfoAlert, "You can only use 8bit skin on your device.", 0, 0);  			gPrefs->skin.cardNo	= cardNo; @@ -226,7 +226,7 @@ Boolean SkinsFormHandleEvent(EventPtr eventP) {  	Boolean handled = false;  	switch (eventP->eType) { -	 +  		case frmOpenEvent:  			SkinsFormInit(true);  			handled = true; @@ -247,11 +247,11 @@ Boolean SkinsFormHandleEvent(EventPtr eventP) {  				case SkinsCancelButton:  					SkinsFormExit(false);  					break; -					 +  				case SkinsBeamButton:  					SkinsFormBeam();  					break; -				 +  				case SkinsDeleteButton:  					SkinsFormDelete();  					break; @@ -262,6 +262,6 @@ Boolean SkinsFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  } diff --git a/backends/PalmOS/Src/forms/forminfo.cpp b/backends/PalmOS/Src/forms/forminfo.cpp index b8ef6d573e..01f086ecbc 100644 --- a/backends/PalmOS/Src/forms/forminfo.cpp +++ b/backends/PalmOS/Src/forms/forminfo.cpp @@ -42,7 +42,7 @@ void GetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFr  	UInt32		dynamicFree = 0;  	// Iterate through each card to support devices with multiple cards. -	nCards = MemNumCards();		 +	nCards = MemNumCards();  	for (cardNo = 0; cardNo < nCards; cardNo++) {  		// Iterate through the RAM heaps on a card (excludes ROM). @@ -51,7 +51,7 @@ void GetMemory(UInt32* storageMemoryP, UInt32* dynamicMemoryP, UInt32 *storageFr  			heapID = MemHeapID(cardNo, i);  			// Calculate the total memory and free memory of the heap.  			MemHeapFreeBytes(heapID, &free, &max); -			 +  			// If the heap is dynamic, increment the dynamic memory total.  			if (MemHeapDynamic(heapID)) {  				dynamicMemory += MemHeapSize(heapID); @@ -89,10 +89,10 @@ static void SystemTabDraw() {  	GetMemory(&sm, &dm, &sf, &df);  	stack = GetStackSize(); -	 +  	WinSetTextColor(UIColorGetTableEntryIndex(UIObjectForeground));  	FntSetFont(stdFont); -	 +  	StrIToA(num, dm);  	x = 147 - FntCharsWidth(num, StrLen(num)) + 5;  	WinDrawChars(num, StrLen(num), x, 12 + 30); @@ -182,6 +182,6 @@ Boolean InfoFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  } diff --git a/backends/PalmOS/Src/forms/formmain.cpp b/backends/PalmOS/Src/forms/formmain.cpp index cb8d875eb3..0ffeeccb15 100644 --- a/backends/PalmOS/Src/forms/formmain.cpp +++ b/backends/PalmOS/Src/forms/formmain.cpp @@ -25,7 +25,7 @@ static Err BeamMe() {  		err = SendDatabase(0, dbID, "ScummVM.prc", "\nPlay your favorite LucasArts games");  	else  		err = DmGetLastErr(); -	 +  	return err;  } @@ -90,7 +90,7 @@ static Boolean MainFormDoCommand(UInt16 command)   			FrmPopupForm(InfoForm);   			handled = true;  			break; -		 +  		case MainGamesMusicSound:  			FrmPopupForm(MusicForm);  			handled = true; @@ -115,7 +115,7 @@ static Boolean MainFormDoCommand(UInt16 command)   *   * FUNCTION:    MainFormHandleEvent   * - * DESCRIPTION: This routine is the event handler for the  + * DESCRIPTION: This routine is the event handler for the   *              "MainForm" of this application.   *   * PARAMETERS:  eventP  - a pointer to an EventType structure @@ -136,7 +136,7 @@ static Boolean PenDownRepeat() {  	if (penDown && sknLastOn) {  		RectangleType r;  		DmOpenRef skinDBP; -	 +  		skinDBP = SknOpenSkin();  		SknGetObjectBounds(skinDBP, sknLastOn, &r); @@ -145,14 +145,14 @@ static Boolean PenDownRepeat() {  				SknSetState(skinDBP, sknLastOn, sknStateSelected);  				SknShowObject(skinDBP, sknLastOn);  			} -			 +  			switch (sknLastOn) {  				case skinSliderUpArrow:  				case skinSliderDownArrow:  					handled = SknProcessArrowAction(sknLastOn);  					break;  			} -			 +  		} else {  			if (SknGetState(skinDBP, sknLastOn) != sknStateNormal) {  				SknSetState(skinDBP, sknLastOn, sknStateNormal); @@ -162,7 +162,7 @@ static Boolean PenDownRepeat() {  		SknCloseSkin(skinDBP);  	} -	 +  	return handled;  } @@ -173,7 +173,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  	FormPtr frmP;  	Coord x,y;  	DmOpenRef skinDBP; -	 +  	switch (eventP->eType) {  		case frmUpdateEvent:  		{ @@ -216,11 +216,11 @@ Boolean MainFormHandleEvent(EventPtr eventP)  					//gPrefs->card.volRefNum = parseCards(true);  					FrmPopupForm(CardSlotForm);  					break; -			 +  				case MainAboutButton:  		 			FrmPopupForm(InfoForm);  					break; -				 +  //				case MainListTypeSelTrigger:  //					FrmList(eventP, MainListTypeList);  //					break; @@ -232,7 +232,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  			x = eventP->screenX;  			y = eventP->screenY;  			lastIndex = dmMaxRecordIndex;	// enable select/unselect list item -			 +  			if (sknLastOn != skinButtonNone) {  				RectangleType r;  				skinDBP = SknOpenSkin(); @@ -240,7 +240,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  				SknSetState(skinDBP, sknLastOn, sknStateNormal);  				SknShowObject(skinDBP, sknLastOn);  				SknCloseSkin(skinDBP); -				 +  				if (RctPtInRectangle(x*2, y*2, &r)) {  					switch (sknLastOn) {  						case skinButtonGameAdd: @@ -297,7 +297,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  					case skinButtonGameDelete:  					case skinButtonGameAudio:  						SknSetState(skinDBP, sknLastOn, sknStateSelected); -						SknShowObject(skinDBP, sknLastOn);				 +						SknShowObject(skinDBP, sknLastOn);  						if (gPrefs->soundClick)  							SndPlaySystemSound(sndClick);  						handled = true; @@ -309,7 +309,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  				SknSelect(x, y);  			}  			break; -		 +  		case keyDownEvent:  			if (	(eventP->data.keyDown.chr >= 'a' && eventP->data.keyDown.chr <= 'z') ||  					(eventP->data.keyDown.chr >= 'A' && eventP->data.keyDown.chr <= 'Z')) { @@ -319,7 +319,7 @@ Boolean MainFormHandleEvent(EventPtr eventP)  				}  			}  			break; -		 +  		default:  			handled = PenDownRepeat();  	} diff --git a/backends/PalmOS/Src/forms/formmusic.cpp b/backends/PalmOS/Src/forms/formmusic.cpp index 9a1670fd62..b1c43191b6 100644 --- a/backends/PalmOS/Src/forms/formmusic.cpp +++ b/backends/PalmOS/Src/forms/formmusic.cpp @@ -19,7 +19,7 @@ static Boolean MusicTabSave() {  	FieldType *fld1P;  	UInt16 tempo;  	FormPtr frmP; -	 +  	frmP = FrmGetActiveForm();  	cck1P = (ControlType *)GetObjectPtr(TabMusicMusicCheckbox); @@ -40,7 +40,7 @@ static Boolean MusicTabSave() {  	musicInfoP->sound.drvMusic = LstGetSelection(list1P);  	musicInfoP->sound.tempo = tempo; -	 +  	return true;  } @@ -87,7 +87,7 @@ static void SoundTabSave() {  static void SoundTabInit() {  	ControlType *cck1P;  	ListType *list1P; -	 +  	cck1P = (ControlType *)GetObjectPtr(TabSoundSoundCheckbox);  	list1P = (ListType *)GetObjectPtr(TabSoundRateList); @@ -103,7 +103,7 @@ static Boolean AudioCDTabSave() {  	ListType *list1P, *list2P;  	UInt16 firstTrack;  	FormPtr frmP; -	 +  	frmP = FrmGetActiveForm();  	cck3P = (ControlType *)GetObjectPtr(TabAudioCDMP3Checkbox); @@ -111,7 +111,7 @@ static Boolean AudioCDTabSave() {  	fld3P = (FieldType *)GetObjectPtr(TabAudioCDFirstTrackField);  	list1P = (ListType *)GetObjectPtr(TabAudioCDDriverList);  	list2P = (ListType *)GetObjectPtr(TabAudioCDFormatList); -	 +  	firstTrack = StrAToI(FldGetTextPtr(fld3P));  	if (firstTrack < 1 || firstTrack > 999) {  		TabSetActive(frmP, myTabP, 2); @@ -127,7 +127,7 @@ static Boolean AudioCDTabSave() {  	musicInfoP->sound.defaultTrackLength = StrAToI(FldGetTextPtr(fld2P));  	musicInfoP->sound.firstTrack = firstTrack; -	 +  	return true;  } @@ -168,13 +168,13 @@ static void AudioCDTabInit() {  // Volume  static void VolumeTabSave() {  	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P; -	 +  	slid1P = (SliderControlType *)GetObjectPtr(TabVolumeMasterSliderControl);  	slid2P = (SliderControlType *)GetObjectPtr(TabVolumeMusicSliderControl);  	slid3P = (SliderControlType *)GetObjectPtr(TabVolumeSfxSliderControl);  	slid4P = (SliderControlType *)GetObjectPtr(TabVolumeSpeechSliderControl);  	slid5P = (SliderControlType *)GetObjectPtr(TabVolumeAudioCDSliderControl); -			 +  	CtlGetSliderValues ((ControlType *)slid1P, 0, 0, 0, &musicInfoP->volume.master);  	CtlGetSliderValues ((ControlType *)slid2P, 0, 0, 0, &musicInfoP->volume.music);  	CtlGetSliderValues ((ControlType *)slid3P, 0, 0, 0, &musicInfoP->volume.sfx); @@ -185,7 +185,7 @@ static void VolumeTabSave() {  static void VolumeTabInit() {  	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P;  	UInt16 value; -	 +  	slid1P = (SliderControlType *)GetObjectPtr(TabVolumeMasterSliderControl);  	slid2P = (SliderControlType *)GetObjectPtr(TabVolumeMusicSliderControl);  	slid3P = (SliderControlType *)GetObjectPtr(TabVolumeSfxSliderControl); @@ -238,7 +238,7 @@ static void MusicFormInit(UInt16 index) {  		recordH = DmQueryRecord(gameDB, index);  		gameInfoP = (GameInfoType *)MemHandleLock(recordH); -		 +  		if (!gameInfoP) {  			FrmCustomAlert(FrmErrorAlert, "An error occured.",0,0);  			return; @@ -280,7 +280,7 @@ Boolean MusicFormHandleEvent(EventPtr eventP) {  			MusicFormInit(GamGetSelected());  			handled = true;  			break; -			 +  		case ctlSelectEvent:  			switch (eventP->data.ctlSelect.controlID)  			{ @@ -291,14 +291,14 @@ Boolean MusicFormHandleEvent(EventPtr eventP) {  					lastTab = (eventP->data.ctlSelect.controlID - MusicForm - 1);  					TabSetActive(frmP, myTabP, lastTab);  					break; -					 +  				case TabMusicDriverPopTrigger:  					FrmList(eventP, TabMusicDriverList);  					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabMusicDriverList)); -					 +  					if (!OPTIONS_TST(kOptDeviceZodiac) && !OPTIONS_TST(kOptSonyPa1LibAPI)) {  						ListType *list1P = (ListType *)GetObjectPtr(TabMusicDriverList); -						 +  						if (LstGetSelection(list1P) == 1) {  							FrmCustomAlert(FrmInfoAlert, "There is no built-in MIDI support on your device.", 0, 0);  							LstSetSelection(list1P, 0); @@ -310,7 +310,7 @@ Boolean MusicFormHandleEvent(EventPtr eventP) {  				case TabSoundRatePopTrigger:  					FrmList(eventP, TabSoundRateList);  					FrmHideObject(frmP, FrmGetObjectIndex(frmP, TabSoundRateList)); -					 +  					if (!OPTIONS_TST(kOptPalmSoundAPI)) {  						ListType *list1P = (ListType *)GetObjectPtr(TabSoundRateList); @@ -358,6 +358,6 @@ Boolean MusicFormHandleEvent(EventPtr eventP) {  		default:  			break;  	} -	 +  	return handled;  } diff --git a/backends/PalmOS/Src/forms/formtabs.cpp b/backends/PalmOS/Src/forms/formtabs.cpp index 9c62f37542..b24a3f829f 100644 --- a/backends/PalmOS/Src/forms/formtabs.cpp +++ b/backends/PalmOS/Src/forms/formtabs.cpp @@ -11,15 +11,15 @@ TabType *TabNewTabs(UInt16 cnt) {  	newP->count = 0;  	newP->width = 0;  	newP->tabs = new TabDataType[cnt]; -	 +  	return newP;  }  void TabDeleteTabs(TabType *tabP) {  	UInt16 cnt, num;  	num = MemPtrSize(tabP->tabs) / sizeof(TabDataType); -	 -	for (cnt = 0; cnt < num; cnt++)	 + +	for (cnt = 0; cnt < num; cnt++)  		FrmDeleteForm(tabP->tabs[cnt].srcP);  	delete tabP->tabs; @@ -34,14 +34,14 @@ Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscI  	Coord x, y, w, h;  	UInt16 id;  	RectangleType r; -	 +  	dstP = (void **)frmP;  	srcP = FrmInitForm(rscID);  	objNum = FrmGetNumberOfObjects(srcP);  	// save tab data -	 +  	// it's required to keep to source forms active  	// while the tab form is not close for list data ptr (items text)  	// TODO : fix this ! @@ -61,7 +61,7 @@ Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscI  	ControlType *addP = CtlNewControl(dstP, (FrmGetFormId(*frmP) + tabP->count), buttonCtl, nameP, x, y, w, h, stdFont, 0, true);  	CtlGlueSetFrameStyle(addP, noButtonFrame);  	tabP->width += w + 1; -	 +  	// create tab content  	for (cnt = 0; cnt < objNum; cnt++) {  		objP = FrmGetObjectPtr(srcP, cnt); @@ -86,7 +86,7 @@ Err TabAddContent(FormType **frmP, TabType *tabP, const Char *nameP, UInt16 rscI  				UInt16 items = LstGetNumberOfItems((ListType *)objP);  				UInt16 trigger = id - 1;  				trigger = (FrmGetObjectIndex((FormType *)*dstP, trigger) != frmInvalidObjectId) ? trigger : 0; -				 +  				LstNewList(dstP, id, x, y, w, h, font, visible, trigger);  				newP = (ListType *)FrmGetObjectPtr((FormType *)*dstP, FrmGetObjectIndex((FormType *)*dstP, id));  				LstSetListChoices(newP, itemsP, items); @@ -174,25 +174,25 @@ void TabSetActive(FormType *frmP, TabType *tabP, UInt16 num) {  	// set tabs size  	for (cnt = 0; cnt < tabP->count; cnt++) {  		idx = FrmGetObjectIndex (frmP, (FrmGetFormId(frmP) + cnt + 1)); -		 +  		if (idx != frmInvalidObjectId) {  			FrmGetObjectBounds(frmP, idx, &r);  			r.topLeft.y	= (num == cnt) ? 17 : 17;  			r.extent.y	= (num == cnt) ? 12 : 11;  			FrmSetObjectBounds(frmP, idx, &r); -			 +  			if (num == cnt) {  				RGBColorType yellow = {0,255,192,0}; -				 +  				r.topLeft.y	-= 1;  				WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame)); -				WinDrawRectangleFrame(simpleFrame, &r);  +				WinDrawRectangleFrame(simpleFrame, &r);  				WinSetForeColor(WinRGBToIndex(&yellow));  				WinDrawLine(r.topLeft.x, r.topLeft.y, r.topLeft.x + r.extent.x - 1, r.topLeft.y);  				FrmShowObject(frmP, idx);  			} else {  				WinSetForeColor(UIColorGetTableEntryIndex(UIObjectFrame)); -				WinDrawRectangleFrame(simpleFrame, &r);  +				WinDrawRectangleFrame(simpleFrame, &r);  			}  		}  	}  | 
