[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104505: * src/gtkutil.c (xg_get_defa
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104505: * src/gtkutil.c (xg_get_default_scrollbar_width): Avoid warning. |
Date: |
Mon, 06 Jun 2011 00:20:42 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104505
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-06-06 00:20:42 +0200
message:
* src/gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.
modified:
src/ChangeLog
src/gtkutil.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-06-05 22:20:42 +0000
+++ b/src/ChangeLog 2011-06-05 22:20:42 +0000
@@ -1,5 +1,7 @@
2011-06-05 Andreas Schwab <address@hidden>
+ * gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.
+
* xfns.c (x_set_scroll_bar_default_width): Move declarations
before statements.
=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c 2011-06-05 19:04:51 +0000
+++ b/src/gtkutil.c 2011-06-05 22:20:42 +0000
@@ -3329,11 +3329,15 @@
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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104505: * src/gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.,
Andreas Schwab <=