Returning to GtkApplication and dropping GtkOSXApplication.

Perry Werneck
1 parent 11c7ab0e
Showing 1 changed file with 2 additions and 8 deletions Show diff stats
src/objects/application/private.h
@@ -46,19 +46,13 @@
 #include <lib3270.h>
 #include <lib3270/log.h>
  
-#ifdef __APPLE__
-	#include <gtkosxapplication.h>
-#endif // __APPLE__
-
 #include <pw3270/application.h>
  
 struct _pw3270Application {
-#ifdef __APPLE__
-	GtkosxApplication parent;
-#else
 	GtkApplication parent;
+#ifndef __APPLE__
 	PW3270_UI_STYLE	ui_style;
-#endif // __APPLE__
+#endif // !__APPLE__
  
 	GSettings	* settings;
 	GList		* keypads;
...	...	@@ -46,19 +46,13 @@
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		-#endif // __APPLE__
	55	+#endif // !__APPLE__
62	56
63	57	GSettings * settings;
64	58	GList * keypads;
...	...