From: Po Lu <luangruo@yahoo.com>
Date: Sat, 12 Mar 2022 12:58:18 +0000 (+0800)
Subject: Fix the PGTK build
X-Git-Tag: emacs-29.0.90~1931^2~1185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ef9dc7797729a547dace431f57a73fe278172cc;p=emacs.git

Fix the PGTK build

* src/gtkutil.c (xg_finish_scroll_bar_creation): Fix ifdefs
preventing x_window from being correctly set.
(xg_get_scroll_id_for_window): Ifdef out unused function.
---

diff --git a/src/gtkutil.c b/src/gtkutil.c
index c9a3999afe7..7287f6761db 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4440,7 +4440,7 @@ xg_get_default_scrollbar_height (struct frame *f)
   return scroll_bar_width_for_theme * xg_get_scale (f);
 }
 
-#if defined HAVE_PGTK || !defined HAVE_GTK3
+#ifndef HAVE_GTK3
 /* Return the scrollbar id for X Window WID on display DPY.
    Return -1 if WID not in id_to_widget.  */
 
@@ -4556,7 +4556,7 @@ xg_finish_scroll_bar_creation (struct frame *f,
 #endif
 #endif
 
-#if !defined HAVE_GTK3 || !defined HAVE_GTK3
+#if defined HAVE_PGTK || !defined HAVE_GTK3
   bar->x_window = scroll_id;
 #endif
 }