AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk: remove remaining GDK_WINDOWING_QUARTZ usage

Browse Source
This commit is contained in:
Christian Hergert 2020-10-29 13:57:28 -07:00
parent 5a77994516
commit 6298fd1eef
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk/gdkdisplaymanager.c
View File

@ -36,16 +36,6 @@
#include "x11/gdkprivate-x11.h" #include "x11/gdkprivate-x11.h"
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ
/* When the gdk_quartz_display_open function is removed We can
* immediately include gdkquartzdisplaymanager.h here instead of
* gdkprivate-quartz.h so that we won’t have to enable -xobjective-c
* for the “generic” GDK source code.
* #include "quartz/gdkquartzdisplaymanager.h"
*/
#include "quartz/gdkprivate-quartz.h"
#endif
#ifdef GDK_WINDOWING_BROADWAY #ifdef GDK_WINDOWING_BROADWAY
#include "broadway/gdkprivate-broadway.h" #include "broadway/gdkprivate-broadway.h"
#endif #endif
@ -98,8 +88,8 @@
* } * }
* else * else
* #endif * #endif
* #ifdef GDK_WINDOWING_QUARTZ * #ifdef GDK_WINDOWING_MACOS
* if (GDK_IS_QUARTZ_DISPLAY (display)) * if (GDK_IS_MACOS_DISPLAY (display))
* { * {
* // make Quartz-specific calls here * // make Quartz-specific calls here
* } * }
@ -263,9 +253,6 @@ struct _GdkBackend {
}; };
static GdkBackend gdk_backends[] = { static GdkBackend gdk_backends[] = {
#ifdef GDK_WINDOWING_QUARTZ
{ "quartz", _gdk_quartz_display_open },
#endif
#ifdef GDK_WINDOWING_MACOS #ifdef GDK_WINDOWING_MACOS
{ "macos", _gdk_macos_display_open }, { "macos", _gdk_macos_display_open },
#endif #endif
@ -305,7 +292,7 @@ gdk_display_manager_get (void)
if (manager == NULL) if (manager == NULL)
manager = g_object_new (GDK_TYPE_DISPLAY_MANAGER, NULL); manager = g_object_new (GDK_TYPE_DISPLAY_MANAGER, NULL);
return manager; return manager;
} }
@ -344,7 +331,7 @@ gdk_display_get_default (void)
* gdk_display_manager_set_default_display: * gdk_display_manager_set_default_display:
* @manager: a #GdkDisplayManager * @manager: a #GdkDisplayManager
* @display: a #GdkDisplay * @display: a #GdkDisplay
* *
* Sets @display as the default display. * Sets @display as the default display.
**/ **/
void void