diff options
author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-03-27 14:51:00 -0400 |
---|---|---|
committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-03-27 14:51:33 -0400 |
commit | 799a017db3f12468e719500a3fa5be5c0c078299 (patch) | |
tree | 9d528839a15ab71cfe236b71e9fb8f7f18a832f9 /gladeui/glade-placeholder.c | |
parent | 99eaffb84ab8251b94f0c400ee18990de7cb6f29 (diff) | |
download | glade-799a017db3f12468e719500a3fa5be5c0c078299.tar.gz |
* gladeui/glade-marshallers.list, gladeui/glade-placeholder.c:
Make GladePlaceholder a scrollable widget (hypothetically) to avoid runtime warnings.
* plugins/gtk+/gtk+.xml.in: Disabled "has-separator" of GtkMessageDialog as it ignores the separator
and the setting is useless (not to mention setting it causes runtime warnings: fixes bug 587288).
* gladeui/glade-project.[ch]: Expose glade_project_get_target_version()
* plugins/gtk+/glade-gtk.c:
- check project target gtk+ version to decide initial state
of GtkEntry::buffer.
- Substitute the old manual evaluation with GPC_VERSION_CHECK()
- Avoid critical warnings when setting GtkColorButton properties to NULL
- Avoid critical warnings when setting GtkComboBoxEntry::text-column < 0
* gladeui/glade-property-class.h: Created convenience macro GPC_VERSION_CHECK
* gladeui/glade-utils.c: Allow loading of libraries installed in optional non-system prefixes;
(so that GtkSourceView catalog is buildable and usable from your jhbuild environment)
assume a path that is: ${prefix}/lib/glade3/modules/../../ and search it after the initial
module search path.
Diffstat (limited to 'gladeui/glade-placeholder.c')
-rw-r--r-- | gladeui/glade-placeholder.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gladeui/glade-placeholder.c b/gladeui/glade-placeholder.c index a902e7ac..b35eabc1 100644 --- a/gladeui/glade-placeholder.c +++ b/gladeui/glade-placeholder.c @@ -35,6 +35,7 @@ */ #include <gtk/gtk.h> +#include "glade-marshallers.h" #include "glade.h" #include "glade-placeholder.h" #include "glade-xml-utils.h" @@ -101,6 +102,19 @@ glade_placeholder_class_init (GladePlaceholderClass *klass) widget_class->motion_notify_event = glade_placeholder_motion_notify_event; widget_class->button_press_event = glade_placeholder_button_press; widget_class->popup_menu = glade_placeholder_popup_menu; + + /* Avoid warnings when adding placeholders to scrolled windows */ + widget_class->set_scroll_adjustments_signal = + g_signal_new ("set-scroll-adjustments", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + 0, /* G_STRUCT_OFFSET (GladePlaceholderClass, set_scroll_adjustments) */ + NULL, NULL, + glade_marshal_VOID__OBJECT_OBJECT, + G_TYPE_NONE, 2, + GTK_TYPE_ADJUSTMENT, + GTK_TYPE_ADJUSTMENT); + } static void |