Mercurial > hg > idav / file diff

--- a/ui/gtk/toolkit.c	Sun Feb 11 15:59:56 2024 +0100
+++ b/ui/gtk/toolkit.c	Mon Feb 12 17:32:02 2024 +0100
@@ -48,7 +48,7 @@
 static GtkApplication *app;
 #endif
 
-static char *application_name;
+static const char *application_name;
 
 static ui_callback   startup_func;
 static void          *startup_data;
@@ -64,14 +64,16 @@
 
 static int scale_factor = 1;
 
-void ui_init(char *appname, int argc, char **argv) {
+UIEXPORT void ui_init(const char *appname, int argc, char **argv) {
     uic_init_global_context();
     
     gtk_init(&argc, &argv);
     application_name = appname;
     
     uic_docmgr_init();
-    ui_toolbar_init();
+    ui_toolbar_init(); // TODO: remove
+    
+    uic_toolbar_init();
     
     // init custom types
     ui_list_init();
@@ -86,7 +88,7 @@
 #endif
 }
 
-char* ui_appname() {
+const char* ui_appname() {
     return application_name;
 }