From e114d5c5dddc934167bb4ea5a8474c867c9a2de5 Mon Sep 17 00:00:00 2001 From: elasota Date: Sat, 14 Mar 2020 12:03:50 -0400 Subject: [PATCH] Clean out unused API --- GpApp/Coordinates.cpp | 1 - GpApp/Events.cpp | 23 ------- GpApp/Externs.h | 1 - GpApp/Link.cpp | 1 - GpApp/Menu.cpp | 103 ----------------------------- GpApp/SelectHouse.cpp | 2 +- GpApp/Tools.cpp | 1 - GpApp/WindowUtils.cpp | 2 +- PortabilityLayer/PLCore.cpp | 32 --------- PortabilityLayer/PLCore.h | 23 ------- PortabilityLayer/WindowManager.cpp | 2 +- 11 files changed, 3 insertions(+), 188 deletions(-) diff --git a/GpApp/Coordinates.cpp b/GpApp/Coordinates.cpp index 112fec2..785af46 100644 --- a/GpApp/Coordinates.cpp +++ b/GpApp/Coordinates.cpp @@ -152,7 +152,6 @@ void OpenCoordWindow (void) wm->PutWindowBehind(coordWindow, wm->GetPutInFrontSentinel()); PortabilityLayer::WindowManager::GetInstance()->ShowWindow(coordWindow); // FlagWindowFloating(coordWindow); TEMP - use flaoting windows - HiliteAllWindows(); coordH = -1; coordV = -1; diff --git a/GpApp/Events.cpp b/GpApp/Events.cpp index 93d5cb8..d02b2d9 100644 --- a/GpApp/Events.cpp +++ b/GpApp/Events.cpp @@ -92,7 +92,6 @@ void HandleMouseEvent (const GpMouseInputEvent &theEvent, uint32_t tick) GetWindowLeftTop(whichWindow, &isLinkH, &isLinkV); else if (whichWindow == coordWindow) GetWindowLeftTop(whichWindow, &isCoordH, &isCoordV); - HiliteAllWindows(); break; case RegionIDs::kClose: @@ -507,28 +506,6 @@ void HandleEvent (void) } } -//-------------------------------------------------------------- HiliteAllWindows - -// Ugly kludge in order to keep "floating windows" (palettes) on top ofÉ -// the main window. - -void HiliteAllWindows (void) -{ - PL_NotYetImplemented_TODO("DeleteMe"); -#if 0 - if (mainWindow != nil) - HiliteWindow(mainWindow, true); - if (mapWindow != nil) - HiliteWindow(mapWindow, true); - if (toolsWindow != nil) - HiliteWindow(toolsWindow, true); - if (coordWindow != nil) - HiliteWindow(coordWindow, true); - if (linkWindow != nil) - HiliteWindow(linkWindow, true); -#endif -} - //-------------------------------------------------------------- IgnoreThisClick // Another inelegant kludge designed to temporarily prevent an unwantedÉ diff --git a/GpApp/Externs.h b/GpApp/Externs.h index c61aca3..ee23a5d 100644 --- a/GpApp/Externs.h +++ b/GpApp/Externs.h @@ -162,7 +162,6 @@ void FillScreenRed (void); void DumpToResEditFile (Ptr, long); void HandleEvent (void); // --- Event.c -void HiliteAllWindows (void); void IgnoreThisClick (void); short WhatsOurDepth (void); // --- Environs.c diff --git a/GpApp/Link.cpp b/GpApp/Link.cpp index bce37a6..232e4df 100644 --- a/GpApp/Link.cpp +++ b/GpApp/Link.cpp @@ -238,7 +238,6 @@ void OpenLinkWindow (void) GetWindowRect(linkWindow, &dest); PortabilityLayer::WindowManager::GetInstance()->ShowWindow(linkWindow); // FlagWindowFloating(linkWindow); TEMP - use flaoting windows - HiliteAllWindows(); PortabilityLayer::WidgetBasicState basicState; basicState.m_rect = Rect::Create(5, 70, 25, 124); diff --git a/GpApp/Menu.cpp b/GpApp/Menu.cpp index 0c15983..c7954ec 100644 --- a/GpApp/Menu.cpp +++ b/GpApp/Menu.cpp @@ -29,9 +29,6 @@ void UpdateMenusEditMode (void); void UpdateMenusNonEditMode (void); void UpdateMenusHouseOpen (void); void UpdateMenusHouseClosed (void); -void UpdateResumeDialog (Dialog *); -Boolean ResumeFilter (Dialog *, EventRecord *, short *); -short QueryResumeGame (void); void HeyYourPissingAHighScore (void); @@ -666,106 +663,6 @@ void UpdateCoordinateCheckmark (Boolean checkIt) CheckMenuItem(houseMenu, iCoordinateWindow, checkIt); } -//-------------------------------------------------------------- UpdateResumeDialog -// Update function for Resume dialog (below). - -void UpdateResumeDialog (Dialog *theDialog) -{ - DrawDialog(theDialog); - DrawDefaultButton(theDialog); -} - -//-------------------------------------------------------------- ResumeFilter -// Dialog filter for the Resume dialog (below). - -Boolean ResumeFilter (Dialog *dial, EventRecord *event, short *item) -{ - switch (event->what) - { - case keyDown: - switch (event->message) - { - case PL_KEY_SPECIAL(kEnter): - case PL_KEY_NUMPAD_SPECIAL(kEnter): - FlashDialogButton(dial, kOkayButton); - *item = kOkayButton; - return(true); - break; - - default: - return(false); - } - break; - - case updateEvt: - if ((WindowPtr)event->message == dial->GetWindow()) - { - SetPortDialogPort(dial); - UpdateResumeDialog(dial); - EndUpdate(dial->GetWindow()); - event->what = nullEvent; - } - return(false); - break; - - default: - return(false); - break; - } -} - -//-------------------------------------------------------------- QueryResumeGame -// Dialog that asks user whether they want to resume a saved game orÉ -// begin a new one. It displays a little info on the state of theirÉ -// saved game (number of glider left, points, etc.). - -short QueryResumeGame (void) -{ - #define kResumeGameDial 1025 - Dialog *theDial; - houseType *thisHousePtr; - Str255 scoreStr, glidStr; - long hadPoints; - short hitWhat, hadGliders; - char wasState; - Boolean leaving; - - // get score & num. gliders - thisHousePtr = *thisHouse; - hadPoints = thisHousePtr->savedGame.score; - hadGliders = thisHousePtr->savedGame.numGliders; - NumToString(hadPoints, scoreStr); // param text strings - NumToString((long)hadGliders, glidStr); - - DialogTextSubstitutions substitutions; - if (hadGliders == 1) - substitutions = DialogTextSubstitutions(glidStr, PSTR(""), scoreStr); - else - substitutions = DialogTextSubstitutions(glidStr, PSTR("s"), scoreStr); - -// CenterDialog(kResumeGameDial); - theDial = PortabilityLayer::DialogManager::GetInstance()->LoadDialog(kResumeGameDial, kPutInFront, &substitutions); - if (theDial == nil) - RedAlert(kErrDialogDidntLoad); - SetPort(&theDial->GetWindow()->GetDrawSurface()->m_port); - - ShowWindow(theDial->GetWindow()); - DrawDefaultButton(theDial); - leaving = false; - - while (!leaving) - { - ModalDialog(ResumeFilter, &hitWhat); - if ((hitWhat == kSheWantsNewGame) || (hitWhat == kSheWantsResumeGame)) - { - leaving = true; - } - } - theDial->Destroy(); - - return (hitWhat); -} - //-------------------------------------------------------------- DoNotInDemo // Only compiled for "demo version" of Glider PRO. It brings up aÉ // dialog that says, essentially, "x" feature is not implemented inÉ diff --git a/GpApp/SelectHouse.cpp b/GpApp/SelectHouse.cpp index e62f587..542b156 100644 --- a/GpApp/SelectHouse.cpp +++ b/GpApp/SelectHouse.cpp @@ -76,7 +76,7 @@ void UpdateLoadDialog (Dialog *theDialog) theWindow = theDialog->GetWindow(); DrawSurface *surface = theWindow->GetDrawSurface(); - GetWindowBounds(theWindow, kWindowContentRgn, &dialogRect); + dialogRect = theWindow->GetDrawSurface()->m_port.GetRect(); ColorFrameWHRect(theDialog->GetWindow()->GetDrawSurface(), 8, 39, 413, 184, kRedOrangeColor8); // box around files diff --git a/GpApp/Tools.cpp b/GpApp/Tools.cpp index 0329c25..8684850 100644 --- a/GpApp/Tools.cpp +++ b/GpApp/Tools.cpp @@ -319,7 +319,6 @@ void OpenToolsWindow (void) wm->PutWindowBehind(toolsWindow, wm->GetPutInFrontSentinel()); wm->ShowWindow(toolsWindow); // FlagWindowFloating(toolsWindow); TEMP - use flaoting windows - HiliteAllWindows(); { PortabilityLayer::WidgetBasicState state; diff --git a/GpApp/WindowUtils.cpp b/GpApp/WindowUtils.cpp index 9fb356d..75be2cc 100644 --- a/GpApp/WindowUtils.cpp +++ b/GpApp/WindowUtils.cpp @@ -63,7 +63,7 @@ void GetLocalWindowRect (WindowPtr theWindow, Rect *bounds) if (theWindow != nil) { SetPortWindowPort(theWindow); - GetWindowBounds(theWindow, kWindowContentRgn, bounds); + *bounds = theWindow->GetDrawSurface()->m_port.GetRect(); } } diff --git a/PortabilityLayer/PLCore.cpp b/PortabilityLayer/PLCore.cpp index f0732c4..ca87b1a 100644 --- a/PortabilityLayer/PLCore.cpp +++ b/PortabilityLayer/PLCore.cpp @@ -108,11 +108,6 @@ short FindWindow(Point point, WindowPtr *window) return part; } -void BringToFront(WindowPtr window) -{ - PL_NotYetImplemented(); -} - bool TrackGoAway(WindowPtr window, Point point) { PL_NotYetImplemented(); @@ -131,21 +126,6 @@ bool TrackBox(WindowPtr window, Point point, int part) return false; } -void HiliteWindow(WindowPtr window, bool highlighted) -{ - PL_NotYetImplemented(); -} - -void GetWindowBounds(WindowPtr window, WindowRegionType windowRegion, Rect *rect) -{ - if (windowRegion == kWindowContentRgn) - *rect = window->m_surface.m_port.GetRect(); - else - { - PL_NotYetImplemented(); - } -} - WindowPtr GetNewCWindow(int resID, void *storage, WindowPtr behind) { Handle windowResource = PortabilityLayer::ResourceManager::GetInstance()->GetAppResource('WIND', resID); @@ -168,18 +148,6 @@ WindowPtr GetNewCWindow(int resID, void *storage, WindowPtr behind) return window; } -WindowPtr NewCWindow(void *storage, const Rect *bounds, const PLPasStr &title, Boolean visible, int wdef, WindowPtr behind, long userdata) -{ - PL_NotYetImplemented(); - return nullptr; -} - -WindowPtr NewWindow(void *storage, const Rect *bounds, const PLPasStr &title, Boolean visible, int wdef, WindowPtr behind, long userdata) -{ - PL_NotYetImplemented(); - return nullptr; -} - void SizeWindow(WindowPtr window, int width, int height, Boolean addToUpdateRegion) { PortabilityLayer::WindowManager::GetInstance()->ResizeWindow(window, width, height); diff --git a/PortabilityLayer/PLCore.h b/PortabilityLayer/PLCore.h index 38fa304..7aef823 100644 --- a/PortabilityLayer/PLCore.h +++ b/PortabilityLayer/PLCore.h @@ -214,24 +214,6 @@ namespace RegionIDs typedef RegionIDs::RegionID RegionID_t; -enum WindowRegionType -{ - kWindowContentRgn -}; - -enum EventCode -{ - mouseDown, - mouseUp, - mouseMove, - keyDown, - keyUp, - autoKey, - updateEvt, - osEvt, - kHighLevelEvent, -}; - static const int everyEvent = -1; static const int iBeamCursor = 1; @@ -252,16 +234,11 @@ void HideCursor(); void Delay(int ticks, UInt32 *endTickCount); short FindWindow(Point point, WindowPtr *window); // Translates global coordinates to window coordinates, returns a region ID -void BringToFront(WindowPtr window); bool TrackGoAway(WindowPtr window, Point point); // Returns true if the close box was actually clicked (?) Int32 GrowWindow(WindowPtr window, Point start, Rect *size); bool TrackBox(WindowPtr window, Point point, int part); // Returns true if grow/shrink box was clicked (part corresponds to type) -void HiliteWindow(WindowPtr window, bool highlighted); -void GetWindowBounds(WindowPtr window, WindowRegionType windowRegion, Rect *rect); WindowPtr GetNewCWindow(int resID, void *storage, WindowPtr behind); -WindowPtr NewCWindow(void *storage, const Rect *bounds, const PLPasStr &title, Boolean visible, int wdef, WindowPtr behind, long userdata); -WindowPtr NewWindow(void *storage, const Rect *bounds, const PLPasStr &title, Boolean visible, int wdef, WindowPtr behind, long userdata); void SizeWindow(WindowPtr window, int width, int height, Boolean addToUpdateRegion); void MoveWindow(WindowPtr window, int x, int y, Boolean moveToFront); void ShowWindow(WindowPtr window); diff --git a/PortabilityLayer/WindowManager.cpp b/PortabilityLayer/WindowManager.cpp index 0847df7..225f83e 100644 --- a/PortabilityLayer/WindowManager.cpp +++ b/PortabilityLayer/WindowManager.cpp @@ -674,7 +674,7 @@ namespace PortabilityLayer if (m_windowStackTop == impl) { if (WindowImpl *below = impl->GetWindowBelow()) - BringToFront(below); + PutWindowBehind(below, GetPutInFrontSentinel()); } }