aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2011-06-06 00:20:42 +0200
committerAndreas Schwab2011-06-06 00:20:42 +0200
commit810928a2bf270091177f0ca041f89141b6d633ca (patch)
tree7a85bc7df45b2225b1f0545b068c1e0371533799 /src
parent7e821d0da8ac3e8a96071bd1198dc271f56460e9 (diff)
downloademacs-810928a2bf270091177f0ca041f89141b6d633ca.tar.gz
emacs-810928a2bf270091177f0ca041f89141b6d633ca.zip
* src/xfns.c (x_set_scroll_bar_default_width): Move declarations
before statements.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 34982819c28..9e80c2ec88e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-06-05 Andreas Schwab <schwab@linux-m68k.org>
2
3 * xfns.c (x_set_scroll_bar_default_width): Move declarations
4 before statements.
5
12011-06-05 Jan Djärv <jan.h.d@swipnet.se> 62011-06-05 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * gtkutil.c (xg_get_default_scrollbar_width): New function. 8 * gtkutil.c (xg_get_default_scrollbar_width): New function.
diff --git a/src/xfns.c b/src/xfns.c
index 2fd995df341..34ffdbffbfe 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1696,12 +1696,13 @@ x_set_scroll_bar_default_width (struct frame *f)
1696{ 1696{
1697 int wid = FRAME_COLUMN_WIDTH (f); 1697 int wid = FRAME_COLUMN_WIDTH (f);
1698 int minw = 16; 1698 int minw = 16;
1699 int width;
1699#ifdef USE_TOOLKIT_SCROLL_BARS 1700#ifdef USE_TOOLKIT_SCROLL_BARS
1700#ifdef USE_GTK 1701#ifdef USE_GTK
1701 minw = xg_get_default_scrollbar_width (f); 1702 minw = xg_get_default_scrollbar_width (f);
1702#endif 1703#endif
1703 /* A minimum width of 14 doesn't look good for toolkit scroll bars. */ 1704 /* A minimum width of 14 doesn't look good for toolkit scroll bars. */
1704 int width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM; 1705 width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM;
1705 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid; 1706 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid;
1706 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width; 1707 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width;
1707#else 1708#else