1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-24 16:38:07 +02:00

Fix Mac build breaker.

Caused by declaring a variable later than a conditionally compiled piece of code.
Net result is that Mac will be less tolerant of a window partly off the top of the screen than Windows will be, and will reset it to the default.
This commit is contained in:
James Crook 2016-09-02 18:25:59 +01:00
parent 8d55ab9afd
commit f6870896a1

View File

@ -710,7 +710,9 @@ void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized)
}
wxRect screenRect( wxGetClientDisplayRect());
#if defined(__WXMAC__)
// On OSX, the top of the window should never be less than the menu height,
// so something is amiss if it is
if (normalRect.y < screenRect.y) {
@ -787,7 +789,7 @@ void GetNextWindowPlacement(wxRect *nextRect, bool *pMaximized, bool *pIconized)
wxPoint p = nextRect->GetLeftTop();
int scr = std::max( 0, wxDisplay::GetFromPoint( p ));
wxDisplay d( scr );
wxRect screenRect = d.GetClientArea();
screenRect = d.GetClientArea();
// Now we (possibly) start trimming our rectangle down.
// Have we hit the right side of the screen?