Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Manager: Fixes to allow building 64-bit application on Macintosh.

This commit is contained in:
Charlie Fenton 2017-10-20 03:17:27 -07:00 committed by Christian Beer
parent f7bea49eb0
commit b6e4995e7c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clientgui/DlgEventLog.cpp
View File

@ -1032,7 +1032,10 @@ wxInt32 CDlgEventLog::FormatTime(wxInt32 item, wxString& strBuffer) const {
#ifdef __WXMAC__
// Work around a wxCocoa bug(?) in wxDateTime::Format()
char buf[80];
struct tm * timeinfo = localtime((time_t*)&message->timestamp);
// When building as a 64-bit app, we must convert
// 4-byte int message->timestamp to 8-byte time_t
time_t timeStamp = message->timestamp;
struct tm * timeinfo = localtime(&timeStamp);
strftime(buf, sizeof(buf), "%c", timeinfo);
strBuffer = buf;
#else

25
clientgui/mac/BOINCGUIApp.mm
View File

@ -137,17 +137,25 @@ void CBOINCGUIApp::ShowApplication(bool bShow) {
}
// NSTitledWindowMask is deprecated in OS 10.12 and is replaced by
// NSWindowStyleMaskTitled, which is not defined before OS 10.12
#ifndef NSWindowStyleMaskTitled
#define NSWindowStyleMaskTitled NSTitledWindowMask
#endif
// Returns true if at least a 5 X 5 pixel area of the
// window's title bar is entirely on the displays
// Note: Arguments are Quickdraw-style coordinates,
// but CGDisplayBounds() sets top left corner as (0, 0)
// Note: Arguments are wxWidgets / Quickdraw-style coordinates
// (y=0 at top) but NSScreen coordinates have y=0 at bottom
Boolean IsWindowOnScreen(int iLeft, int iTop, int iWidth, int iHeight) {
CGRect intersectedRect;
CGRect titleRect = CGRectMake(iLeft, iTop, iWidth, 22);
NSRect testFrameRect = NSMakeRect(100, 100, 200, 200);
NSRect testContentRect = [NSWindow contentRectForFrameRect:testFrameRect
styleMask:NSWindowStyleMaskTitled];
CGFloat titleBarHeight = testFrameRect.size.height - testContentRect.size.height;
// Make sure at least a 5X5 piece of title bar is visible
titleRect = CGRectInset(titleRect, 5, 5);
NSRect titleRect = NSMakeRect(iLeft, iTop, iWidth, titleBarHeight);
titleRect = NSInsetRect(titleRect, 5, 5);
NSArray *allScreens = [NSScreen screens];
unsigned int i;
// The geometries of windows and display arangements are such
@ -158,12 +166,11 @@ Boolean IsWindowOnScreen(int iLeft, int iTop, int iWidth, int iHeight) {
for (i=0; i<numDisplays; i++) {
NSScreen *aScreen = (NSScreen *)[ allScreens objectAtIndex:i ];
NSRect visibleRect = [aScreen visibleFrame]; // Usable area of screen
// Convert to QuickDraw coordinates (Y=0 at top of screen)
// Convert to wxWidgets coordinates (Y=0 at top of screen)
NSRect fullScreenRect = [aScreen frame];
visibleRect.origin.y = fullScreenRect.size.height - visibleRect.origin.y - visibleRect.size.height;
intersectedRect = CGRectIntersection(visibleRect, titleRect);
if (! CGRectIsNull(intersectedRect)) {
if (NSIntersectsRect(visibleRect, titleRect)) {
return true;
}
}