Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 13:27:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

* src/gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.

Browse source
This commit is contained in:
Andreas Schwab 2011-06-06 00:20:42 +02:00
parent 810928a2bf
commit 43f862f74e
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,5 +1,7 @@
2011-06-05 Andreas Schwab <schwab@linux-m68k.org>
* gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.
* xfns.c (x_set_scroll_bar_default_width): Move declarations
before statements.

12
src/gtkutil.c
View file

@ -3329,11 +3329,15 @@ xg_get_widget_from_map (int idx)
int
xg_get_default_scrollbar_width (FRAME_PTR f)
{
GtkWidget *wscroll = gtk_vscrollbar_new (gtk_adjustment_new (XG_SB_MIN,
XG_SB_MIN,
XG_SB_MAX,
0.1, 0.1, 0.1));
#ifdef HAVE_GTK3
GtkAdjustment *vadj;
#else
GtkObject *vadj;
#endif
GtkWidget *wscroll;
int w = 0, b = 0;
vadj = gtk_adjustment_new (XG_SB_MIN, XG_SB_MIN, XG_SB_MAX, 0.1, 0.1, 0.1);
wscroll = gtk_vscrollbar_new (GTK_ADJUSTMENT (vadj));
gtk_widget_style_get (wscroll, "slider-width", &w, "trough-border", &b, NULL);
gtk_widget_destroy (wscroll);
w += 2*b;