callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chain up. This makes it possible to have accelerators tags on GtkDialog

Browse Source 
2007-12-28  Johan Dahlin  <johan@gnome.org>

	* gtk/gtkdialog.c (gtk_dialog_buildable_custom_finished)
	(gtk_dialog_buildable_custom_tag_start): Chain up. 
	This makes it possible to have accelerators tags on GtkDialog 
	subclasses.


svn path=/trunk/; revision=19268
This commit is contained in:
Johan Dahlin
2007-12-28 10:36:07 +00:00
committed by Johan Dahlin
parent c32421418a
commit f3ec3ddac2
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-12-28 Johan Dahlin <johan@gnome.org>
* gtk/gtkdialog.c (gtk_dialog_buildable_custom_finished)
(gtk_dialog_buildable_custom_tag_start): Chain up.
This makes it possible to have accelerators tags on GtkDialog
subclasses.
2007-12-28 Mathias Hasselmann <mathias@openismus.com> 2007-12-28 Mathias Hasselmann <mathias@openismus.com>
Add GTK_CALENDAR_SHOW_DETAILS display flag, which chooses if details Add GTK_CALENDAR_SHOW_DETAILS display flag, which chooses if details

10
gtk/gtkdialog.c
View File

@ -280,9 +280,12 @@ gtk_dialog_init (GtkDialog *dialog)
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
} }
static GtkBuildableIface *parent_buildable_iface;
static void static void
gtk_dialog_buildable_interface_init (GtkBuildableIface *iface) gtk_dialog_buildable_interface_init (GtkBuildableIface *iface)
{ {
parent_buildable_iface = g_type_interface_peek_parent (iface);
iface->get_internal_child = gtk_dialog_buildable_get_internal_child; iface->get_internal_child = gtk_dialog_buildable_get_internal_child;
iface->custom_tag_start = gtk_dialog_buildable_custom_tag_start; iface->custom_tag_start = gtk_dialog_buildable_custom_tag_start;
iface->custom_finished = gtk_dialog_buildable_custom_finished; iface->custom_finished = gtk_dialog_buildable_custom_finished;
@ -1365,7 +1368,8 @@ gtk_dialog_buildable_custom_tag_start (GtkBuildable *buildable,
return TRUE; return TRUE;
} }
return FALSE; return parent_buildable_iface->custom_tag_start (buildable, builder, child,
tagname, parser, data);
} }
static void static void
@ -1383,7 +1387,11 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
guint signal_id; guint signal_id;
if (strcmp (tagname, "action-widgets")) if (strcmp (tagname, "action-widgets"))
{
parent_buildable_iface->custom_finished (buildable, builder, child,
tagname, user_data);
return; return;
}
dialog = GTK_DIALOG (buildable); dialog = GTK_DIALOG (buildable);
parser_data = (ActionWidgetsSubParserData*)user_data; parser_data = (ActionWidgetsSubParserData*)user_data;

1
tests/buildertest.c
View File

@ -1758,6 +1758,7 @@ test_file (const gchar *filename)
g_object_unref (builder); g_object_unref (builder);
builder = NULL; builder = NULL;
} }
int int