Download as
Browse Code »

Commit 1b79368e4e528e5bfd24df4e31a2481cf035547f

Authored by Perry Werneck
1 parent 11c7ab0e
Exists in master and in 2 other branches develop, script-support

Fixing MAC build.

Showing 3 changed files with 3 additions and 13 deletions   Show diff stats
configure.ac
  Diff comments   View file @1b79368
... ... @@ -241,7 +241,7 @@ case "$host" in
241 241 ;;
242 242  
243 243 *-apple-darwin*)
244   - 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.]))
  244 + PKG_CHECK_MODULES( [GTK], [gtk+-3.0 glib-2.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.]))
245 245 ;;
246 246  
247 247 *)
... ...
src/objects/application/application.c
  Diff comments   View file @1b79368
... ... @@ -38,11 +38,7 @@ static void startup(GApplication * application);
38 38 static void activate(GApplication * application);
39 39 static void finalize(GObject *object);
40 40  
41   -#ifdef __APPLE__
42   - G_DEFINE_TYPE(pw3270Application, pw3270Application, GTKOSX_TYPE_APPLICATION);
43   -#else
44   - G_DEFINE_TYPE(pw3270Application, pw3270Application, GTK_TYPE_APPLICATION);
45   -#endif // __APPLE__
  41 +G_DEFINE_TYPE(pw3270Application, pw3270Application, GTK_TYPE_APPLICATION);
46 42  
47 43 static void get_property(GObject *object, guint prop_id, GValue *value, GParamSpec G_GNUC_UNUSED(*pspec)) {
48 44  
... ...
src/objects/application/private.h
  Diff comments   View file @1b79368
... ... @@ -46,17 +46,11 @@
46 46 #include <lib3270.h>
47 47 #include <lib3270/log.h>
48 48  
49   -#ifdef __APPLE__
50   - #include <gtkosxapplication.h>
51   -#endif // __APPLE__
52   -
53 49 #include <pw3270/application.h>
54 50  
55 51 struct _pw3270Application {
56   -#ifdef __APPLE__
57   - GtkosxApplication parent;
58   -#else
59 52 GtkApplication parent;
  53 +#ifndef __APPLE__
60 54 PW3270_UI_STYLE ui_style;
61 55 #endif // __APPLE__
62 56  
... ...