Mercurial > hg > toolkit / file diff

--- a/ui/gtk/toolkit.c	Sun Jan 22 11:16:21 2017 +0100
+++ b/ui/gtk/toolkit.c	Sun Jan 22 11:48:50 2017 +0100
@@ -42,7 +42,9 @@
 
 #include <pthread.h>
 
+#ifndef UI_GTK2
 static GtkApplication *app;
+#endif
 
 static char *application_name;
 
@@ -93,16 +95,20 @@
 }
 
 
+#ifndef UI_GTK2
 static void app_startup(GtkApplication* app, gpointer userdata) {
-    startup_func(NULL, startup_data);
+    if(startup_func) {
+        startup_func(NULL, startup_data);
+    }
 }
 
 static void app_activate(GtkApplication* app, gpointer userdata) {
     printf("activate\n");
 }
+#endif
 
 void ui_main() {
-#ifndef GTK2_LEGACY
+#ifndef UI_GTK2
     sstr_t appid = ucx_sprintf(
             "ui.%s",
             application_name ? application_name : "application1");
@@ -117,14 +123,18 @@
     
     free(appid.ptr);
 #else
+    if(startup_func) {
+        startup_func(NULL, startup_data);
+    }
     gtk_main();
 #endif
-    if(appclose_fnc) {
-        appclose_fnc(NULL, appclose_udata);
+    if(exit_func) {
+        exit_func(NULL, exit_data);
     }
     uic_store_app_properties();
 }
 
+#ifndef UI_GTK2
 void ui_app_quit() {
     g_application_quit(G_APPLICATION(app));
 }
@@ -132,6 +142,7 @@
 GtkApplication* ui_get_application() {
     return app;
 }
+#endif
 
 void ui_show(UiObject *obj) {
     uic_check_group_widgets(obj->ctx);