From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 4 Jul 2020 06:38:33 +0000 (+0200)
Subject: gtk.in.h: Remove redundant macro replacements.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14079b6799908ed3408a729772495208dc381ed;p=pspp

gtk.in.h: Remove redundant macro replacements.

Today configure.ac insists upon Gtk+ 3.22 so working around older
Gtk+ versions is no longer required.
---

diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h
index ab97cd7afa..6bfb3d069b 100644
--- a/src/ui/gui/include/gtk/gtk.in.h
+++ b/src/ui/gui/include/gtk/gtk.in.h
@@ -1,5 +1,5 @@
 /* Wrapper for <gtk/gtk.h>.
-   Copyright (C) 2011, 2012, 2017 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012, 2017, 2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,20 +29,4 @@
 #define G_CONST_RETURN const
 #endif
 
-
-#if (GTK_CHECK_VERSION(3,8,0) == 0)
-#define gtk_widget_register_window(widget, window) gdk_window_set_user_data (window, widget)
-#endif
-
-#if (GTK_CHECK_VERSION(3,22,0) == 0)
-static inline void
-gtk_menu_popup_at_pointer (GtkMenu *menu, const GdkEvent *trigger)
-{
-  const GdkEventButton *be = trigger;
-  gtk_menu_popup (menu, NULL, NULL, NULL, NULL, be ? be->button : 0, be ?  be->time : 0);
-}
-#endif
-
-
-
 #endif /* PSPP_GTK_GTK_H */