Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk:

Browse Source 
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
This commit is contained in:
Cody Russell
2008-01-31 17:56:34 +00:00
committed by Cody Russell
parent 26078768ee
commit dd5f8231d7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -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

5
gtk/gtkpaned.c
View File

@@ -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
}