summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Natterer <mitch@imendio.com>2008-07-21 14:35:51 +0000
committerMichael Natterer <mitch@src.gnome.org>2008-07-21 14:35:51 +0000
commit8a1bdcbe4a98e067634d61a52e5235c90723bfa9 (patch)
treeeb4d8423cc51ff2fb24411f21a59b2ad3c848138
parent1db019204296a7eee28dab2b23a0e0397af6dd38 (diff)
downloadgtk+-8a1bdcbe4a98e067634d61a52e5235c90723bfa9.tar.gz
use gtk_box_pack_start() instead of the deprecated
2008-07-21 Michael Natterer <mitch@imendio.com> * gtk/gtkbox.c (gtk_box_add): use gtk_box_pack_start() instead of the deprecated gtk_box_pack_start_defaults(). * gtk/gtkbindings.c (gtk_binding_entry_add_signal) (gtk_binding_parse_signal): use _gtk_binding_entry_add_signall() instead of the deprecated gtk_binding_entry_add_signall(). svn path=/trunk/; revision=20885
-rw-r--r--ChangeLog9
-rw-r--r--gtk/gtkbindings.c13
-rw-r--r--gtk/gtkbox.c2
3 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 6920491e75..c3aeac9da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-21 Michael Natterer <mitch@imendio.com>
+
+ * gtk/gtkbox.c (gtk_box_add): use gtk_box_pack_start() instead of
+ the deprecated gtk_box_pack_start_defaults().
+
+ * gtk/gtkbindings.c (gtk_binding_entry_add_signal)
+ (gtk_binding_parse_signal): use _gtk_binding_entry_add_signall()
+ instead of the deprecated gtk_binding_entry_add_signall().
+
2008-07-21 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c:
diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c
index 85734f770e..662dcf17de 100644
--- a/gtk/gtkbindings.c
+++ b/gtk/gtkbindings.c
@@ -31,6 +31,7 @@
#include <string.h>
#include <stdarg.h>
#include <gdkkeysyms.h>
+
#include "gtkbindings.h"
#include "gtkkeyhash.h"
#include "gtkwidget.h"
@@ -958,7 +959,7 @@ gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
if (i == n_args || i == 0)
{
slist = g_slist_reverse (slist);
- gtk_binding_entry_add_signall (binding_set, keyval, modifiers, signal_name, slist);
+ _gtk_binding_entry_add_signall (binding_set, keyval, modifiers, signal_name, slist);
}
free_slist = slist;
@@ -1469,11 +1470,11 @@ gtk_binding_parse_signal (GScanner *scanner,
if (!(need_arg && seen_comma) && !negate)
{
args = g_slist_reverse (args);
- gtk_binding_entry_add_signall (binding_set,
- keyval,
- modifiers,
- signal,
- args);
+ _gtk_binding_entry_add_signall (binding_set,
+ keyval,
+ modifiers,
+ signal,
+ args);
expected_token = G_TOKEN_NONE;
}
done = TRUE;
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 409761614e..c3013e9fd1 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -723,7 +723,7 @@ static void
gtk_box_add (GtkContainer *container,
GtkWidget *widget)
{
- gtk_box_pack_start_defaults (GTK_BOX (container), widget);
+ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
}
static void