AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-13 22:10:08 +00:00
Code Issues Projects Releases Wiki Activity

Make the message area available in gtkbuilder as well

Browse Source 
See bug 32069.
This commit is contained in:
Matthias Clasen 2010-06-24 09:34:51 -04:00
parent 7e3e2bf29a
commit f010eeb7d3
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkmessagedialog.c
View File

@ -30,6 +30,7 @@
#include "gtkmessagedialog.h"
#include "gtkaccessible.h"
#include "gtkbuildable.h"
#include "gtklabel.h"
#include "gtkhbox.h"
#include "gtkvbox.h"
@ -85,6 +86,14 @@
* dialog);
* </programlisting>
* </example>
*
* <refsect2 id="GtkMessageDialog-BUILDER-UI">
* <title>GtkMessageDialog as GtkBuildable</title>
* <para>
* The GtkMessageDialog implementation of the GtkBuildable interface exposes
* the message area as an internal child with the name "message_area".
* </para>
* </refsect2>
*/
#define GTK_MESSAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogPrivate))
@ -113,6 +122,11 @@ static void gtk_message_dialog_get_property (GObject *object,
GParamSpec *pspec);
static void gtk_message_dialog_add_buttons (GtkMessageDialog *message_dialog,
GtkButtonsType buttons);
static void gtk_message_dialog_buildable_interface_init (GtkBuildableIface *iface);
static GObject * gtk_message_dialog_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *childname);
enum {
PROP_0,
@ -126,7 +140,32 @@ enum {
PROP_MESSAGE_AREA
};
G_DEFINE_TYPE (GtkMessageDialog, gtk_message_dialog, GTK_TYPE_DIALOG)
G_DEFINE_TYPE_WITH_CODE (GtkMessageDialog, gtk_message_dialog, GTK_TYPE_DIALOG,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_message_dialog_buildable_interface_init))
static GtkBuildableIface *parent_buildable_iface;
static void
gtk_message_dialog_buildable_interface_init (GtkBuildableIface *iface)
{
parent_buildable_iface = g_type_interface_peek_parent (iface);
iface->get_internal_child = gtk_message_dialog_buildable_get_internal_child;
iface->custom_tag_start = parent_buildable_iface->custom_tag_start;
iface->custom_finished = parent_buildable_iface->custom_finished;
}
static GObject *
gtk_message_dialog_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
const gchar *childname)
{
if (strcmp (childname, "message_area") == 0)
return G_OBJECT (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (buildable)));
return parent_buildable_iface->get_internal_child (buildable, builder, childname);
}
static void
gtk_message_dialog_class_init (GtkMessageDialogClass *class)

31
gtk/tests/builder.c
View File

@ -1493,6 +1493,36 @@ test_dialog (void)
g_object_unref (builder);
}
static void
test_message_dialog (void)
{
GtkBuilder * builder;
const gchar buffer1[] =
"<interface>"
" <object class=\"GtkMessageDialog\" id=\"dialog1\">"
" <child internal-child=\"message_area\">"
" <object class=\"GtkVBox\" id=\"dialog-message-area\">"
" <child>"
" <object class=\"GtkExpander\" id=\"expander\"/>"
" </child>"
" </object>"
" </child>"
" </object>"
"</interface>";
GObject *dialog1;
GObject *expander;
builder = builder_new_from_string (buffer1, -1, NULL);
dialog1 = gtk_builder_get_object (builder, "dialog1");
expander = gtk_builder_get_object (builder, "expander");
g_assert (GTK_IS_EXPANDER (expander));
g_assert (gtk_widget_get_parent (GTK_WIDGET (expander)) == gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog1)));
gtk_widget_destroy (GTK_WIDGET (dialog1));
g_object_unref (builder);
}
static void
test_accelerators (void)
{
@ -2586,6 +2616,7 @@ main (int argc, char **argv)
g_test_add_func ("/Builder/AddObjects", test_add_objects);
g_test_add_func ("/Builder/Menus", test_menus);
g_test_add_func ("/Builder/MessageArea", test_message_area);
g_test_add_func ("/Builder/MessageDialog", test_message_dialog);
return g_test_run();
}