diff options
| author | Cody Russell <bratsche@gnome.org> | 2008-01-31 17:56:34 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2008-01-31 17:56:34 +0000 |
| commit | dd5f8231d7f11700d0656b6f312d2772ee653165 (patch) | |
| tree | c39956e14cd72c0cd228a12f46dcfe5878de98c6 | |
| parent | 26078768eeb0c98af16d4ba1f3b585030a94d85c (diff) | |
| download | gdk-pixbuf-dd5f8231d7f11700d0656b6f312d2772ee653165.tar.gz | |
Merge from trunk:
2008-01-31 Cody Russell <bratsche@gnome.org>
Merge from trunk:
* gtk/gtkpaned.c (gtk_paned_set_position):
Change queue_resize() to queue_draw(), and add a check for
child2 != NULL in case someone calls this before there is
a child packed in there. (#144269 again)
svn path=/branches/gtk-2-12/; revision=19450
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gtk/gtkpaned.c | 5 |
2 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2008-01-31 Cody Russell <bratsche@gnome.org> + + Merge from trunk: + + * gtk/gtkpaned.c (gtk_paned_set_position): + Change queue_resize() to queue_draw(), and add a check for + child2 != NULL in case someone calls this before there is + a child packed in there. (#144269 again) + 2008-01-31 Richard Hult <richard@imendio.com> Merge from trunk, except for the reverting since that part wasn't diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 0bf8cabe0..30053da25 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -1235,7 +1235,10 @@ gtk_paned_set_position (GtkPaned *paned, #ifdef G_OS_WIN32 /* Hacky work-around for bug #144269 */ - gtk_widget_queue_resize (paned->child2); + if (paned->child2 != NULL) + { + gtk_widget_queue_draw (paned->child2); + } #endif } |