From 155e436259efd24332c2a44ce60897096c454aa3 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 22 Oct 2011 08:55:32 -0400 Subject: [PATCH] ocarina: Set window title and icon during init() I was setting these through other function calls, but it's easier (and cleaner) to do it all in the initial init() call. --- include/ocarina/window.h | 2 +- ocarina/ocarina.cpp | 5 +---- ocarina/window.cpp | 5 +++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/ocarina/window.h b/include/ocarina/window.h index 5e98c0d1..59633af1 100644 --- a/include/ocarina/window.h +++ b/include/ocarina/window.h @@ -4,7 +4,7 @@ #include void window_resize(int, int); -void window_init(); +void window_init(string, string); void window_add(GtkWidget *); void window_title(string); void window_icon(string); diff --git a/ocarina/ocarina.cpp b/ocarina/ocarina.cpp index 36df8036..d80085b5 100644 --- a/ocarina/ocarina.cpp +++ b/ocarina/ocarina.cpp @@ -27,10 +27,7 @@ void ocarina_idle_add() void ocarina_init(int argc, char **argv) { - window_init(); - window_title("Ocarina " + vers_str()); - window_icon("images/ocarina.png"); - + window_init("Ocarina " + vers_str(), "images/ocarina.png"); window_add(get_tabs()); library_init(); settings_init(); diff --git a/ocarina/window.cpp b/ocarina/window.cpp index 8ab8d5b0..c56d8959 100644 --- a/ocarina/window.cpp +++ b/ocarina/window.cpp @@ -28,13 +28,14 @@ void window_icon(string file) gtk_window_set_icon_from_file(GTK_WINDOW(window), file.c_str(), NULL); } -void window_init() +void window_init(string title, string icon) { window = gtk_window_new(GTK_WINDOW_TOPLEVEL); GTK_CONNECT(window, "destroy", destroy_window, NULL); - //window_resize(800, 600); window_resize(800, 600); gtk_widget_show(window); + window_title(title); + window_icon(icon); } void window_add(GtkWidget *widget)