WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 14:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Redo file prompts with in-game UI

Browse Source
This commit is contained in:
elasota
2020-09-12 22:29:57 -04:00
parent 8518d01c70
commit b23bb93506
44 changed files with 1133 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
GpApp/About.cpp
View File

@@ -38,8 +38,8 @@
static void HiLiteOkayButton (DrawSurface *surface);
static void UnHiLiteOkayButton (DrawSurface *surface);
static void UpdateMainPict (Dialog *);
static int16_t AboutFilter(Dialog *, const TimeTaggedVOSEvent *evt);
static int16_t AboutFrameworkFilter(Dialog *, const TimeTaggedVOSEvent *evt);
static int16_t AboutFilter(void *context, Dialog *, const TimeTaggedVOSEvent *evt);
static int16_t AboutFrameworkFilter(void *context, Dialog *, const TimeTaggedVOSEvent *evt);
static Point okayButtLowerV, okayButtUpperV;
@@ -91,7 +91,7 @@ void DoAbout (void)
do // Loop until user wants to exit
{
hit = aboutDialog->ExecuteModal(AboutFilter);
hit = aboutDialog->ExecuteModal(nullptr, AboutFilter);
}
while (hit != kOkayButton);
@@ -152,7 +152,7 @@ void DoAboutFramework (void)
do
{
hit = dialog->ExecuteModal(AboutFrameworkFilter);
hit = dialog->ExecuteModal(nullptr, AboutFrameworkFilter);
} while (hit != kOkayButton);
dialog->Destroy();
@@ -248,7 +248,7 @@ static bool PointIsInDiagonalOkayButton(const Point &pt)
//-------------------------------------------------------------- AboutFilter
// Dialog filter for the About dialog.
static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt)
static int16_t AboutFilter(void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt)
{
bool handledIt = false;
int16_t hit = -1;
@@ -330,7 +330,7 @@ static int16_t AboutFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- AboutFrameworkFilter
// Dialog filter for the About Framework dialog.
static int16_t AboutFrameworkFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt)
static int16_t AboutFrameworkFilter(void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt)
{
bool handledIt = false;
int16_t hit = -1;

12
GpApp/HighScores.cpp
View File

@@ -41,10 +41,10 @@
void DrawHighScores (DrawSurface *);
void UpdateNameDialog (Dialog *);
int16_t NameFilter (Dialog *dial, const TimeTaggedVOSEvent *evt);
int16_t NameFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt);
void GetHighScoreName (short);
void UpdateBannerDialog (Dialog *);
int16_t BannerFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt);
int16_t BannerFilter(void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
void GetHighScoreBanner (void);
Boolean OpenHighScoresFile (const VFileSpec &spec, GpIOStream *&outStream);
@@ -456,7 +456,7 @@ static bool EventIsTyping(const GpKeyboardInputEvent &kbEvent)
//-------------------------------------------------------------- NameFilter
// Dialog filter for the "Enter High Score Name" dialog.
int16_t NameFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t NameFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
short nChars;
@@ -537,7 +537,7 @@ void GetHighScoreName (short place)
while (!leaving)
{
item = theDial->ExecuteModal(NameFilter);
item = theDial->ExecuteModal(nullptr, NameFilter);
if (item == kOkayButton)
{
@@ -571,7 +571,7 @@ void UpdateBannerDialog (Dialog *theDialog)
//-------------------------------------------------------------- BannerFilter
// Dialog filter for the "Enter Message" dialog.
int16_t BannerFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t BannerFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
short nChars;
@@ -647,7 +647,7 @@ void GetHighScoreBanner (void)
while (!leaving)
{
item = theDial->ExecuteModal(BannerFilter);
item = theDial->ExecuteModal(nullptr, BannerFilter);
if (item == kOkayButton)
{

8
GpApp/House.cpp
View File

@@ -26,7 +26,7 @@
void UpdateGoToDialog (Dialog *);
int16_t GoToFilter (Dialog *dial, const TimeTaggedVOSEvent *evt);
int16_t GoToFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt);
extern PortabilityLayer::ResourceArchive *houseResFork;
@@ -67,7 +67,7 @@ Boolean CreateNewHouse (void)
char savePath[sizeof(theSpec.m_name) + 1];
size_t savePathLength = 0;
if (!fm->PromptSaveFile(theSpec.m_dir, savePath, savePathLength, sizeof(theSpec.m_name), PSTR("My House")))
if (!fm->PromptSaveFile(theSpec.m_dir, savePath, savePathLength, sizeof(theSpec.m_name), PSTR("My House"), PSTR("Create House")))
return false;
assert(savePathLength < sizeof(theSpec.m_name) - 1);
@@ -599,7 +599,7 @@ void UpdateGoToDialog (Dialog *theDialog)
//-------------------------------------------------------------- GoToFilter
// Dialog filter for the "Go To Room..." dialog.
int16_t GoToFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t GoToFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -656,7 +656,7 @@ int16_t GoToFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
while (!leaving)
{
item = theDialog->ExecuteModal(GoToFilter);
item = theDialog->ExecuteModal(nullptr, GoToFilter);
if (item == kOkayButton)
{

6
GpApp/HouseInfo.cpp
View File

@@ -34,7 +34,7 @@
long CountTotalHousePoints (void);
void UpdateHouseInfoDialog (Dialog *);
int16_t HouseFilter(Dialog *dial, const TimeTaggedVOSEvent *evt);
int16_t HouseFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt);
Boolean WarnLockingHouse (void);
void HowToZeroScores (void);
@@ -123,7 +123,7 @@ void UpdateHouseInfoDialog (Dialog *theDialog)
//-------------------------------------------------------------- HouseFilter
int16_t HouseFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t HouseFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
Point mouseIs;
short nChars;
@@ -248,7 +248,7 @@ void DoHouseInfo (void)
while (!leaving)
{
item = houseInfoDialog->ExecuteModal(HouseFilter);
item = houseInfoDialog->ExecuteModal(nullptr, HouseFilter);
if (item == kOkayButton)
{

2
GpApp/Link.cpp
View File

@@ -383,7 +383,7 @@ void HandleLinkClick (Point wherePt)
part = FindControl(wherePt, linkWindow, &theControl);
if ((theControl != nil) && (part != 0))
{
part = theControl->Capture(wherePt, nullptr);
part = theControl->Capture(nullptr, wherePt, nullptr);
if (part != 0)
{
if (theControl == linkControl)

12
GpApp/Map.cpp
View File

@@ -489,7 +489,7 @@ void ToggleMapWindow (void)
//-------------------------------------------------------------- LiveHScrollAction
#ifndef COMPILEDEMO
void LiveHScrollAction (PortabilityLayer::Widget *theControl, int thePart)
void LiveHScrollAction (void *captureContext, PortabilityLayer::Widget *theControl, int thePart)
{
short wasValue, newValue;
@@ -546,7 +546,7 @@ void LiveHScrollAction (PortabilityLayer::Widget *theControl, int thePart)
//-------------------------------------------------------------- LiveVScrollAction
#ifndef COMPILEDEMO
void LiveVScrollAction (PortabilityLayer::Widget *theControl, int thePart)
void LiveVScrollAction (void *captureContext, PortabilityLayer::Widget *theControl, int thePart)
{
short wasValue, newValue;
@@ -695,11 +695,11 @@ void HandleMapClick (const GpMouseInputEvent &theEvent)
case kControlDownButtonPart:
case kControlPageUpPart:
case kControlPageDownPart:
whichControl->Capture(wherePt, LiveHScrollAction);
whichControl->Capture(nullptr, wherePt, LiveHScrollAction);
break;
case kControlIndicatorPart:
if (whichControl->Capture(wherePt, nil))
if (whichControl->Capture(nullptr, wherePt, nil))
{
mapLeftRoom = whichControl->GetState();
RedrawMapContents();
@@ -715,11 +715,11 @@ void HandleMapClick (const GpMouseInputEvent &theEvent)
case kControlDownButtonPart:
case kControlPageUpPart:
case kControlPageDownPart:
whichControl->Capture(wherePt, LiveVScrollAction);
whichControl->Capture(nullptr, wherePt, LiveVScrollAction);
break;
case kControlIndicatorPart:
if (whichControl->Capture(wherePt, nil))
if (whichControl->Capture(nullptr, wherePt, nil))
{
mapTopRoom = whichControl->GetState();
RedrawMapContents();

52
GpApp/ObjectInfo.cpp
View File

@@ -347,7 +347,7 @@ void UpdateFlowerInfo (Dialog *theDialog)
//-------------------------------------------------------------- BlowerFilter
int16_t BlowerFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t BlowerFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -381,7 +381,7 @@ int16_t BlowerFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- FurnitureFilter
int16_t FurnitureFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t FurnitureFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -407,7 +407,7 @@ int16_t FurnitureFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- CustPictFilter
int16_t CustPictFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t CustPictFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -431,7 +431,7 @@ int16_t CustPictFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- SwitchFilter
int16_t SwitchFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t SwitchFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -459,7 +459,7 @@ int16_t SwitchFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- TriggerFilter
int16_t TriggerFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t TriggerFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -491,7 +491,7 @@ int16_t TriggerFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- LightFilter
int16_t LightFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t LightFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -519,7 +519,7 @@ int16_t LightFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- ApplianceFilter
int16_t ApplianceFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t ApplianceFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -551,7 +551,7 @@ int16_t ApplianceFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- MicrowaveFilter
int16_t MicrowaveFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t MicrowaveFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -579,7 +579,7 @@ int16_t MicrowaveFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- GreaseFilter
int16_t GreaseFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t GreaseFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -607,7 +607,7 @@ int16_t GreaseFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- InvisBonusFilter
int16_t InvisBonusFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t InvisBonusFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -631,7 +631,7 @@ int16_t InvisBonusFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- TransFilter
int16_t TransFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t TransFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -659,7 +659,7 @@ int16_t TransFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- EnemyFilter
int16_t EnemyFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t EnemyFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -691,7 +691,7 @@ int16_t EnemyFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
//-------------------------------------------------------------- FlowerFilter
int16_t FlowerFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t FlowerFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -785,7 +785,7 @@ void DoBlowerObjectInfo (short what)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(BlowerFilter);
item = infoDial->ExecuteModal(nullptr, BlowerFilter);
if (item == kOkayButton)
{
@@ -937,7 +937,7 @@ void DoFurnitureObjectInfo (void)
while (!leaving)
{
item = infoDial->ExecuteModal(FurnitureFilter);
item = infoDial->ExecuteModal(nullptr, FurnitureFilter);
if (item == kOkayButton)
leaving = true;
@@ -997,7 +997,7 @@ void DoCustPictObjectInfo (void)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(CustPictFilter);
item = infoDial->ExecuteModal(nullptr, CustPictFilter);
if (item == kOkayButton)
{
@@ -1106,7 +1106,7 @@ void DoSwitchObjectInfo (void)
while (!leaving)
{
item = infoDial->ExecuteModal(SwitchFilter);
item = infoDial->ExecuteModal(nullptr, SwitchFilter);
if (item == kOkayButton)
{
@@ -1231,7 +1231,7 @@ void DoTriggerObjectInfo (void)
while (!leaving)
{
item = infoDial->ExecuteModal(TriggerFilter);
item = infoDial->ExecuteModal(nullptr, TriggerFilter);
if (item == kOkayButton)
{
@@ -1371,7 +1371,7 @@ void DoLightObjectInfo (void)
while (!leaving)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(LightFilter);
item = infoDial->ExecuteModal(nullptr, LightFilter);
if (item == kOkayButton)
{
@@ -1465,7 +1465,7 @@ void DoApplianceObjectInfo (short what)
while (!leaving)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(ApplianceFilter);
item = infoDial->ExecuteModal(nullptr, ApplianceFilter);
if (item == kOkayButton)
{
@@ -1585,7 +1585,7 @@ void DoMicrowaveObjectInfo (void)
while (!leaving)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(MicrowaveFilter);
item = infoDial->ExecuteModal(nullptr, MicrowaveFilter);
if (item == kOkayButton)
{
@@ -1695,7 +1695,7 @@ void DoGreaseObjectInfo (void)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(GreaseFilter);
item = infoDial->ExecuteModal(nullptr, GreaseFilter);
if (item == kOkayButton)
{
@@ -1783,7 +1783,7 @@ void DoInvisBonusObjectInfo (void)
while (!leaving)
{
item = infoDial->ExecuteModal(InvisBonusFilter);
item = infoDial->ExecuteModal(nullptr, InvisBonusFilter);
if (item == kOkayButton)
{
@@ -1907,7 +1907,7 @@ void DoTransObjectInfo (short what)
while (!leaving)
{
item = infoDial->ExecuteModal(TransFilter);
item = infoDial->ExecuteModal(nullptr, TransFilter);
if (item == kOkayButton)
{
@@ -2017,7 +2017,7 @@ void DoEnemyObjectInfo (short what)
while (!leaving)
{
item = infoDial->ExecuteModal(EnemyFilter);
item = infoDial->ExecuteModal(nullptr, EnemyFilter);
if (item == kOkayButton)
{
@@ -2113,7 +2113,7 @@ void DoFlowerObjectInfo (void)
{
bool redrawMain = false;
item = infoDial->ExecuteModal(FlowerFilter);
item = infoDial->ExecuteModal(nullptr, FlowerFilter);
if (item == kOkayButton)
{

12
GpApp/RoomInfo.cpp
View File

@@ -47,11 +47,11 @@
void UpdateRoomInfoDialog (Dialog *);
void DragMiniTile (Window *, DrawSurface *, Point, short *);
void HiliteTileOver (DrawSurface *, Point);
int16_t RoomFilter (Dialog *dialog, const TimeTaggedVOSEvent *evt);
int16_t RoomFilter (void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
short ChooseOriginalArt (short);
void UpdateOriginalArt (Dialog *);
int16_t OriginalArtFilter (Dialog *dialog, const TimeTaggedVOSEvent *evt);
int16_t OriginalArtFilter (void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
Boolean PictIDExists (short);
short GetFirstPICT (void);
void BitchAboutPICTNotFound (void);
@@ -344,7 +344,7 @@ void HiliteTileOver (DrawSurface *surface, Point mouseIs)
//-------------------------------------------------------------- RoomFilter
#ifndef COMPILEDEMO
int16_t RoomFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t RoomFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
Point mouseIs;
short newTileOver;
@@ -502,7 +502,7 @@ void DoRoomInfo(void)
{
bool needRedraw = false;
item = roomInfoDialog->ExecuteModal(RoomFilter);
item = roomInfoDialog->ExecuteModal(nullptr, RoomFilter);
if (item == kOkayButton)
{
@@ -639,7 +639,7 @@ void UpdateOriginalArt (Dialog *theDialog)
//-------------------------------------------------------------- OriginalArtFilter
#ifndef COMPILEDEMO
int16_t OriginalArtFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t OriginalArtFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
Point mouseIs;
@@ -737,7 +737,7 @@ short ChooseOriginalArt (short was)
while (!leaving)
{
item = theDialog->ExecuteModal(OriginalArtFilter);
item = theDialog->ExecuteModal(nullptr, OriginalArtFilter);
if (item == kOkayButton)
{

4
GpApp/SavedGames.cpp
View File

@@ -82,7 +82,7 @@ void SaveGame2 (void)
char savePath[sizeof(spec.m_name) + 1];
size_t savePathLength = 0;
if (!fm->PromptSaveFile(spec.m_dir, savePath, savePathLength, sizeof(spec.m_name), PLPasStr(gameNameStr)))
if (!fm->PromptSaveFile(spec.m_dir, savePath, savePathLength, sizeof(spec.m_name), PLPasStr(gameNameStr), PSTR("Save Game")))
{
mm->Release(savedGame);
return;
@@ -191,7 +191,7 @@ Boolean OpenSavedGame (void)
char savePath[sizeof(spec.m_name) + 1];
size_t savePathLength = 0;
if (!fm->PromptOpenFile(spec.m_dir, savePath, savePathLength, sizeof(spec.m_name)))
if (!fm->PromptOpenFile(spec.m_dir, savePath, savePathLength, sizeof(spec.m_name), PSTR("Open Saved Game")))
return false;
assert(savePathLength < sizeof(spec.m_name) - 1);

4
GpApp/SelectHouse.cpp
View File

@@ -201,7 +201,7 @@ void PageDownHouses (Dialog *theDial)
//-------------------------------------------------------------- LoadFilter
#ifndef COMPILEDEMO
int16_t LoadFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t LoadFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
short screenCount, i, wasIndex;
@@ -398,7 +398,7 @@ void DoLoadHouse (void)
while (!leaving)
{
int16_t item = theDial->ExecuteModal(LoadFilter);
int16_t item = theDial->ExecuteModal(nullptr, LoadFilter);
bool requiresRedraw = false;

22
GpApp/Settings.cpp
View File

@@ -97,7 +97,7 @@ void DoDisplayPrefs (void);
void SetAllDefaults (void);
void FlashSettingsButton (DrawSurface *, short);
void UpdateSettingsMain (Dialog *);
int16_t PrefsFilter(Dialog *dialog, const TimeTaggedVOSEvent *evt);
int16_t PrefsFilter(void *context, Dialog *dialog, const TimeTaggedVOSEvent *evt);
void BitchAboutChanges (void);
@@ -158,7 +158,7 @@ void UpdateSettingsBrains (Dialog *theDialog)
//-------------------------------------------------------------- BrainsFilter
int16_t BrainsFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t BrainsFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -253,7 +253,7 @@ void DoBrainsPrefs (void)
while (!leaving)
{
itemHit = prefDlg->ExecuteModal(BrainsFilter);
itemHit = prefDlg->ExecuteModal(nullptr, BrainsFilter);
switch (itemHit)
{
case kOkayButton:
@@ -383,7 +383,7 @@ void UpdateSettingsControl (Dialog *theDialog)
//-------------------------------------------------------------- ControlFilter
int16_t ControlFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t ControlFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
intptr_t wasKeyMap;
@@ -535,7 +535,7 @@ void DoControlPrefs (void)
while (!leaving)
{
itemHit = prefDlg->ExecuteModal(ControlFilter);
itemHit = prefDlg->ExecuteModal(nullptr, ControlFilter);
switch (itemHit)
{
case kOkayButton:
@@ -660,7 +660,7 @@ void HandleSoundMusicChange (short newVolume, Boolean sayIt)
//-------------------------------------------------------------- SoundFilter
int16_t SoundFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t SoundFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
short newVolume;
@@ -757,7 +757,7 @@ void DoSoundPrefs (void)
while (!leaving)
{
itemHit = prefDlg->ExecuteModal(SoundFilter);
itemHit = prefDlg->ExecuteModal(nullptr, SoundFilter);
switch (itemHit)
{
@@ -928,7 +928,7 @@ void DisplayUpdate (Dialog *theDialog)
//-------------------------------------------------------------- DisplayFilter
int16_t DisplayFilter(Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t DisplayFilter(void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
if (!evt)
return -1;
@@ -1025,7 +1025,7 @@ void DoDisplayPrefs (void)
while (!leaving)
{
int16_t itemHit = prefDlg->ExecuteModal(DisplayFilter);
int16_t itemHit = prefDlg->ExecuteModal(nullptr, DisplayFilter);
switch (itemHit)
{
case kOkayButton:
@@ -1202,7 +1202,7 @@ void UpdateSettingsMain (Dialog *theDialog)
//-------------------------------------------------------------- PrefsFilter
int16_t PrefsFilter (Dialog *dial, const TimeTaggedVOSEvent *evt)
int16_t PrefsFilter (void *context, Dialog *dial, const TimeTaggedVOSEvent *evt)
{
short i;
Boolean foundHit;
@@ -1292,7 +1292,7 @@ void DoSettingsMain (void)
while (!leaving)
{
int16_t selectedItem = prefDlg->ExecuteModal(PrefsFilter);
int16_t selectedItem = prefDlg->ExecuteModal(nullptr, PrefsFilter);
switch (selectedItem)
{

2
GpApp/Tools.cpp
View File

@@ -473,7 +473,7 @@ void HandleToolsClick (Point wherePt)
part = FindControl(wherePt, toolsWindow, &theControl);
if ((theControl != nil) && (part != 0))
{
part = theControl->Capture(wherePt, nullptr);
part = theControl->Capture(nullptr, wherePt, nullptr);
if (part != 0)
{
newMode = theControl->GetState();