mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-09-23 14:53:52 +00:00
Remove unused menu bar window
This commit is contained in:
@@ -349,11 +349,6 @@ void HandleUpdateEvent (EventRecord *theEvent)
|
||||
UpdateCoordWindow();
|
||||
EndUpdate(coordWindow);
|
||||
}
|
||||
else if ((WindowPtr)theEvent->message == menuWindow)
|
||||
{
|
||||
UpdateMenuBarWindow(menuWindow->GetDrawSurface());
|
||||
EndUpdate(menuWindow);
|
||||
}
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------- HandleOSEvent
|
||||
|
@@ -151,7 +151,6 @@ void HandleLinkClick (Point);
|
||||
|
||||
void RedrawSplashScreen (void); // --- MainWindow.c
|
||||
void UpdateMainWindow (void);
|
||||
void UpdateMenuBarWindow (DrawSurface *surface);
|
||||
void OpenMainWindow (void);
|
||||
void CloseMainWindow (void);
|
||||
void ZoomBetweenWindows (void);
|
||||
@@ -434,7 +433,6 @@ void QuickBandsRefresh (Boolean);
|
||||
void QuickFoilRefresh (Boolean);
|
||||
void HandleScore (void);
|
||||
void AdjustScoreboardHeight (void);
|
||||
void BlackenScoreboard (DrawSurface *);
|
||||
|
||||
//void PutRoomScrap (void); // --- Scrap.c
|
||||
//void PutObjectScrap (void);
|
||||
|
@@ -26,7 +26,6 @@ struct IGpCursor;
|
||||
|
||||
extern THandle<Rect> mirrorRects;
|
||||
extern WindowPtr mapWindow, toolsWindow, linkWindow;
|
||||
extern WindowPtr menuWindow;
|
||||
extern Rect boardSrcRect, localRoomsDest[];
|
||||
extern IGpCursor *handCursor, *vertCursor, *horiCursor;
|
||||
extern IGpCursor *diagCursor;
|
||||
@@ -213,7 +212,6 @@ void VariableInit (void)
|
||||
coordWindow = nil;
|
||||
toolSrcMap = nil;
|
||||
nailSrcMap = nil;
|
||||
menuWindow = nil;
|
||||
|
||||
RecomputeInterfaceRects();
|
||||
}
|
||||
|
@@ -41,7 +41,7 @@ IGpCursor *diagCursor;
|
||||
Rect workSrcRect;
|
||||
DrawSurface *workSrcMap;
|
||||
Rect mainWindowRect;
|
||||
WindowPtr mainWindow, menuWindow, boardWindow;
|
||||
WindowPtr mainWindow, boardWindow;
|
||||
short isEditH, isEditV;
|
||||
short playOriginH, playOriginV;
|
||||
short splashOriginH, splashOriginV;
|
||||
@@ -165,22 +165,6 @@ void UpdateMainWindow (void)
|
||||
splashDrawn = true;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------- UpdateMenuBarWindow
|
||||
// Ugly kludge to cover over the menu bar when playing game on 2nd monitor.
|
||||
|
||||
void UpdateMenuBarWindow (DrawSurface *surface)
|
||||
{
|
||||
Rect bounds;
|
||||
|
||||
if (menuWindow == nil)
|
||||
return;
|
||||
|
||||
GetLocalWindowRect(menuWindow, &bounds);
|
||||
|
||||
surface->SetForeColor(StdColors::Black());
|
||||
surface->FillRect(bounds);
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------- OpenMainWindow
|
||||
// Opens up the main window (how it does this depends on mode were in).
|
||||
|
||||
@@ -197,10 +181,6 @@ void OpenMainWindow (void)
|
||||
|
||||
if (theMode == kEditMode)
|
||||
{
|
||||
if (menuWindow != nil)
|
||||
PortabilityLayer::WindowManager::GetInstance()->DestroyWindow(menuWindow);
|
||||
menuWindow = nil;
|
||||
|
||||
QSetRect(&mainWindowRect, 0, 0, 512, 322);
|
||||
mainWindow = GetNewCWindow(kEditWindowID, nil, kPutInFront);
|
||||
SizeWindow(mainWindow, mainWindowRect.right,
|
||||
@@ -226,14 +206,6 @@ void OpenMainWindow (void)
|
||||
}
|
||||
else
|
||||
{
|
||||
if (menuWindow == nil)
|
||||
{
|
||||
menuWindow = GetNewCWindow(kMenuWindowID, nil, kPutInFront);
|
||||
SizeWindow(menuWindow, RectWide(&thisMac.constrainedScreen), 20, false);
|
||||
MoveWindow(menuWindow, thisMac.constrainedScreen.left,
|
||||
thisMac.constrainedScreen.top, true);
|
||||
ShowWindow(menuWindow);
|
||||
}
|
||||
if (boardWindow == nil)
|
||||
{
|
||||
PortabilityLayer::WindowManager *windowManager = PortabilityLayer::WindowManager::GetInstance();
|
||||
|
@@ -54,7 +54,6 @@ short batteryTotal, bandsTotal, foilTotal, mortals;
|
||||
Boolean playing, evenFrame, twoPlayerGame, showFoil, demoGoing;
|
||||
Boolean doBackground, playerSuicide, phoneBitSet, tvOn;
|
||||
|
||||
extern WindowPtr menuWindow;
|
||||
extern VFileSpec *theHousesSpecs;
|
||||
extern demoPtr demoData;
|
||||
extern gameType smallGame;
|
||||
|
@@ -450,11 +450,3 @@ void AdjustScoreboardHeight (void)
|
||||
wasScoreboardMode = newMode;
|
||||
}
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------- BlackenScoreboard
|
||||
|
||||
void BlackenScoreboard (DrawSurface *surface)
|
||||
{
|
||||
UpdateMenuBarWindow(surface);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user