Mercurial > emacs

comparison src/gtkutil.c @ 109416:c3ebf31421b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 24 Jun 2010 22:51:08 +0000
parents 98796fa1a7f8
children b5f73bf59a4f
comparison
equal deleted inserted replaced
109415:5922ae6fb6dc 109416:c3ebf31421b2
3211 if (wscroll) 3211 if (wscroll)
3212 { 3212 {
3213 GtkWidget *wfixed = f->output_data.x->edit_widget; 3213 GtkWidget *wfixed = f->output_data.x->edit_widget;
3214 GtkWidget *wparent = gtk_widget_get_parent (wscroll); 3214 GtkWidget *wparent = gtk_widget_get_parent (wscroll);
3215 GtkFixed *wf = GTK_FIXED (wfixed); 3215 GtkFixed *wf = GTK_FIXED (wfixed);
3216 gint msl;
3216 3217
3217 /* Clear out old position. */ 3218 /* Clear out old position. */
3218 GList *iter; 3219 GList *iter;
3219 int oldx = -1, oldy = -1, oldw, oldh; 3220 int oldx = -1, oldy = -1, oldw, oldh;
3220 for (iter = wf->children; iter; iter = iter->next) 3221 for (iter = wf->children; iter; iter = iter->next)
3230 break; 3231 break;
3231 } 3232 }
3232 3233
3233 /* Move and resize to new values. */ 3234 /* Move and resize to new values. */
3234 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top); 3235 gtk_fixed_move (GTK_FIXED (wfixed), wparent, left, top);
3235 gint msl;
3236 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL); 3236 gtk_widget_style_get (wscroll, "min-slider-length", &msl, NULL);
3237 if (msl > height) 3237 if (msl > height)
3238 { 3238 {
3239 /* No room. Hide scroll bar as some themes output a warning if 3239 /* No room. Hide scroll bar as some themes output a warning if
3240 the height is less than the min size. */ 3240 the height is less than the min size. */