diff options
author | Tim Janik <timj@gtk.org> | 2001-03-07 14:49:21 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2001-03-07 14:49:21 +0000 |
commit | 35af5c4eba6c95646a5719bae796ece1dbf92275 (patch) | |
tree | 4a6bf8d5608b902657304b27796591f995ee82f6 /gtk/simple.c | |
parent | 026caeb02ab9c3c094b29383eb895f4fe5981bfd (diff) | |
download | gdk-pixbuf-35af5c4eba6c95646a5719bae796ece1dbf92275.tar.gz |
marshaller fixes.
Wed Mar 7 13:24:57 2001 Tim Janik <timj@gtk.org>
* gtk/*.c: marshaller fixes.
* gtk/gtkmarshal.list: extreme cleanup.
* gtk/gtktreeview.c (gtk_tree_view_class_init): disable interface
param spec for now.
* gtk/gtktexttag.c (gtk_text_tag_set_property): use g_value_get_boxed()
where appliable.
* gtk/gtktypeutils.[hc]: updates to GLib API changes.
special cased autogenerated boxed types from gtktypebuiltins_ids.c
which are not reference counted:
GtkSelectionData, GdkEvent, GdkColor, GtkTextIter, PangoTabArray,
PangoFontDescription, GtkTreeIter and GtkTreePath.
Thu Mar 1 03:58:56 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreeselection.h:
* gtk/gtktreemodel.c:
* gtk/gtktreedatalist.[hc]: fixed includes. no gobject/*
file should be included directly, and gobject/gmarshal.h
as well as gtk/gtkmarshal.h even can't be included directly.
* Makefile.am: grr, install gtk-config-2.0.
* gtk/testgtk.c:
* gtk/simple.c:
* gtk/gtkmenu.c:
* gtk/gtkitemfactory.c: use g_object_connect() instead of
passing "*signal*::*" args to gtk_widget_set().
* gtk/gtktypeutils.[hc]: got rid of GTK_TYPE_SIGNAL.
* gtk/*.c: removed trailer arg from property setters and getters.
macro fixups.
Thu Mar 1 04:01:57 2001 Tim Janik <timj@gtk.org>
* test-gdk-pixbuf.c: fixed includes.
Diffstat (limited to 'gtk/simple.c')
-rw-r--r-- | gtk/simple.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/gtk/simple.c b/gtk/simple.c index 450b3906c..9e57e357a 100644 --- a/gtk/simple.c +++ b/gtk/simple.c @@ -16,22 +16,24 @@ main (int argc, char *argv[]) /* FIXME: This is not allowable - what is this supposed to be? */ /* gdk_progclass = g_strdup ("XTerm"); */ gtk_init (&argc, &argv); - - window = gtk_widget_new (gtk_window_get_type (), - "GtkObject::user_data", NULL, - "GtkObject::signal::destroy", gtk_main_quit, NULL, - "GtkWindow::type", GTK_WINDOW_TOPLEVEL, - "GtkWindow::title", "hello world", - "GtkWindow::allow_grow", FALSE, - "GtkWindow::allow_shrink", FALSE, - "GtkContainer::border_width", 10, - NULL); - button = gtk_widget_new (gtk_button_get_type (), - "GtkButton::label", "hello world", - "GtkObject::signal::clicked", hello, NULL, - "GtkWidget::parent", window, - "GtkWidget::visible", TRUE, - NULL); + + window = g_object_connect (gtk_widget_new (gtk_window_get_type (), + "user_data", NULL, + "type", GTK_WINDOW_TOPLEVEL, + "title", "hello world", + "allow_grow", FALSE, + "allow_shrink", FALSE, + "border_width", 10, + NULL), + "signal::destroy", gtk_main_quit, NULL, + NULL); + button = g_object_connect (gtk_widget_new (gtk_button_get_type (), + "GtkButton::label", "hello world", + "GtkWidget::parent", window, + "GtkWidget::visible", TRUE, + NULL), + "signal::clicked", hello, NULL, + NULL); gtk_widget_show (window); gtk_main (); |