Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=grape.git;a=commitdiff;h=f43feae432c5881571eab28e4cbd4ccadee670e4
commit f43feae432c5881571eab28e4cbd4ccadee670e4 Author: James Buren <r...@frugalware.org> Date: Sat Apr 3 14:17:16 2010 -0500 exports.h/main.c/window_new.c * add filename, parent widget reference diff --git a/src/exports.h b/src/exports.h index 49a85d5..de35902 100644 --- a/src/exports.h +++ b/src/exports.h @@ -24,6 +24,8 @@ #include <gtksourceview/gtksourceview.h> typedef struct SharedInfo { + GtkWindow *parent; + gchar *filename; GtkSourceView *view; GtkSourceBuffer *buffer; GtkImage *action_icon; @@ -38,7 +40,7 @@ GtkToolItem *tool_button_new(const gchar *stock,void (*action) (GtkToolButton *, GtkWidget *toolbar_new(SharedInfo *info); GtkWidget *text_widget_new(SharedInfo *info); GtkWidget *statusbar_new(SharedInfo *info); -GtkWidget *window_new(void); +SharedInfo *window_new(const gchar *filename); void box_pack_widgets(GtkWidget *box,gboolean expand,...); void new_action(GtkToolButton *btn,SharedInfo *info); void save_action(GtkToolButton *btn,SharedInfo *info); diff --git a/src/main.c b/src/main.c index eb91593..d5159da 100644 --- a/src/main.c +++ b/src/main.c @@ -21,13 +21,13 @@ #include "exports.h" gint main(gint argc,gchar **argv) { - GtkWidget *window; + SharedInfo *info; gtk_init(&argc,&argv); - window = window_new(); + info = window_new(NULL); - gtk_widget_show_all(window); + gtk_widget_show_all(info->parent); gtk_main(); diff --git a/src/window_new.c b/src/window_new.c index fd05bc1..50739cd 100644 --- a/src/window_new.c +++ b/src/window_new.c @@ -20,17 +20,19 @@ #include "exports.h" -GtkWidget *window_new(void) { - GtkWidget *window, *vbox; +SharedInfo *window_new(const gchar *filename) { + GtkWidget *vbox; SharedInfo *info; - window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - vbox = gtk_vbox_new(FALSE,0); info = g_new(SharedInfo,1); - gtk_container_add(GTK_CONTAINER(window),vbox); + info->parent = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL)); + + info->filename = g_strdup(filename); + + gtk_container_add(GTK_CONTAINER(info->parent),vbox); box_pack_widgets(vbox,FALSE,toolbar_new(info),NULL); @@ -38,5 +40,5 @@ GtkWidget *window_new(void) { box_pack_widgets(vbox,FALSE,gtk_hseparator_new(),statusbar_new(info),NULL); - return window; + return info; } _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git