callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary casts and silence may-not-return-value warning.

Browse Source 
NSPoint and NSRect are typedefs of CGPoint and CGRect so the casts
were unnecessary and confused llvm when compiling 32-bit.

Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1640
This commit is contained in:
John Ralls
2019-02-19 10:52:43 -08:00
parent 34d6c028b0
commit f3b1704a99
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gdk/quartz/GdkQuartzNSWindow.c
View File

@ -384,40 +384,34 @@
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
if (gdk_quartz_osx_version () >= GDK_OSX_MOJAVE) if (gdk_quartz_osx_version () >= GDK_OSX_MOJAVE)
{
return [super convertPointToScreen: point]; return [super convertPointToScreen: point];
}
#endif #endif
if (gdk_quartz_osx_version () >= GDK_OSX_LION) #if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
if (gdk_quartz_osx_version () < GDK_OSX_LION)
return [self convertBaseToScreen:point];
#endif
{ {
NSRect inrect = NSMakeRect (point.x, point.y, 0.0, 0.0); NSRect inrect = NSMakeRect (point.x, point.y, 0.0, 0.0);
NSRect outrect = [self convertRectToScreen: inrect]; NSRect outrect = [self convertRectToScreen: inrect];
return (NSPoint)((CGRect)outrect).origin; return outrect.origin;
} }
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
return [self convertBaseToScreen:point];
#endif
} }
- (NSPoint)convertPointFromScreen:(NSPoint)point - (NSPoint)convertPointFromScreen:(NSPoint)point
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
if (gdk_quartz_osx_version () >= GDK_OSX_MOJAVE) if (gdk_quartz_osx_version () >= GDK_OSX_MOJAVE)
{
return [super convertPointFromScreen: point]; return [super convertPointFromScreen: point];
}
#endif #endif
if (gdk_quartz_osx_version () >= GDK_OSX_LION) #if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
if (gdk_quartz_osx_version () < GDK_OSX_LION)
return [self convertScreenToBase:point];
#endif
{ {
NSRect inrect = NSMakeRect (point.x, point.y, 0.0, 0.0); NSRect inrect = NSMakeRect (point.x, point.y, 0.0, 0.0);
NSRect outrect = [self convertRectFromScreen: inrect]; NSRect outrect = [self convertRectFromScreen: inrect];
return (NSPoint)((CGRect)outrect).origin; return outrect.origin;
} }
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1070
return [self convertScreenToBase:point];
#endif
} }
- (BOOL)trackManualMove - (BOOL)trackManualMove