Fix build after merge

* lisp/mwheel.el (mouse-wheel-up-event):
* src/gtkutil.c (xg_event_is_for_scrollbar):
* src/termhooks.h (enum output_method): Fix trivial typos.

lisp/mwheel.el

@@ -77,7 +77,7 @@
 
 (defcustom mouse-wheel-up-event
   (if (or (featurep 'w32-win) (featurep 'ns-win)
-          (featurep 'haiku-win) (feautrep 'pgtk-win))
+          (featurep 'haiku-win) (featurep 'pgtk-win))
       'wheel-down
     'mouse-5)
   "Event used for scrolling up."

src/gtkutil.c

@@ -4793,7 +4793,6 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
                || event->type == GDK_MOTION_NOTIFY)
 #endif
 	   )
-               || event->type == MotionNotify))
 #endif /* HAVE_XINPUT2 */
     {
       /* If we are releasing or moving the scroll bar, it has the grab.  */

src/termhooks.h

@@ -61,7 +61,7 @@ enum output_method
   output_msdos_raw,
   output_w32,
   output_ns,
-  output_pgtk
+  output_pgtk,
   output_haiku
 };