From 1b79368e4e528e5bfd24df4e31a2481cf035547f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 10 Feb 2022 20:39:21 -0300 Subject: [PATCH] Fixing MAC build. --- configure.ac | 2 +- src/objects/application/application.c | 6 +----- src/objects/application/private.h | 8 +------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 78fcaeb..edd6154 100644 --- a/configure.ac +++ b/configure.ac @@ -241,7 +241,7 @@ case "$host" in ;; *-apple-darwin*) - PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0 gtk-mac-integration-gtk3], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.])) + PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.])) ;; *) diff --git a/src/objects/application/application.c b/src/objects/application/application.c index 5c5b7b6..00ff813 100644 --- a/src/objects/application/application.c +++ b/src/objects/application/application.c @@ -38,11 +38,7 @@ static void startup(GApplication * application); static void activate(GApplication * application); static void finalize(GObject *object); -#ifdef __APPLE__ - G_DEFINE_TYPE(pw3270Application, pw3270Application, GTKOSX_TYPE_APPLICATION); -#else - G_DEFINE_TYPE(pw3270Application, pw3270Application, GTK_TYPE_APPLICATION); -#endif // __APPLE__ +G_DEFINE_TYPE(pw3270Application, pw3270Application, GTK_TYPE_APPLICATION); static void get_property(GObject *object, guint prop_id, GValue *value, GParamSpec G_GNUC_UNUSED(*pspec)) { diff --git a/src/objects/application/private.h b/src/objects/application/private.h index af92a5e..4747979 100644 --- a/src/objects/application/private.h +++ b/src/objects/application/private.h @@ -46,17 +46,11 @@ #include #include -#ifdef __APPLE__ - #include -#endif // __APPLE__ - #include struct _pw3270Application { -#ifdef __APPLE__ - GtkosxApplication parent; -#else GtkApplication parent; +#ifndef __APPLE__ PW3270_UI_STYLE ui_style; #endif // __APPLE__ -- libgit2 0.21.2