Avoid many -Wparentheses warnings from gtk/gtk.h with gcc8

Add wx/gtk/private/wrapgtk.h wrapping gtk/gtk.h in pragmas disabling these warnings and include it everywhere instead of directly including gtk/gtk.h. Also include wx/gtk/private/gtk2-compat.h from this wrapper header as it was included by 90% of the files including gtk/gtk.h itself and it seems to be better and simpler to just always include it.
2018-05-20 18:43:16 +02:00
parent 8401d3fec9
commit c0b0562533
86 changed files with 79 additions and 164 deletions
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -11,10 +11,9 @@
 #ifndef _WX_GTK_PRIVATE_H_
 #define _WX_GTK_PRIVATE_H_

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 #include "wx/gtk/private/string.h"
-#include "wx/gtk/private/gtk2-compat.h"

 #ifndef G_VALUE_INIT
    // introduced in GLib 2.30
--- a/include/wx/gtk/private/addremovectrl.h
+++ b/include/wx/gtk/private/addremovectrl.h
@@ -14,7 +14,7 @@
 #include "wx/bmpbuttn.h"
 #include "wx/toolbar.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // wxAddRemoveImpl
--- a/include/wx/gtk/private/wrapgtk.h
+++ b/include/wx/gtk/private/wrapgtk.h
@@ -0,0 +1,19 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/private/wrapgtk.h
+// Purpose:     Include gtk/gtk.h without warnings and with compatibility
+// Author:      Vadim Zeitlin
+// Created:     2018-05-20
+// Copyright:   (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_WRAPGTK_H_
+#define _WX_GTK_PRIVATE_WRAPGTK_H_
+
+wxGCC_WARNING_SUPPRESS(parentheses)
+#include <gtk/gtk.h>
+wxGCC_WARNING_RESTORE(parentheses)
+
+#include "wx/gtk/private/gtk2-compat.h"
+
+#endif // _WX_GTK_PRIVATE_WRAPGTK_H_
--- a/include/wx/nativewin.h
+++ b/include/wx/nativewin.h
@@ -38,8 +38,6 @@
    typedef HWND wxNativeContainerWindowHandle;
    typedef HWND wxNativeWindowHandle;
 #elif defined(__WXGTK__)
-    #include <gtk/gtk.h>
-
    // GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32
    #ifdef __UNIX__
        typedef unsigned long wxNativeContainerWindowId;
--- a/samples/widgets/native.cpp
+++ b/samples/widgets/native.cpp
@@ -143,6 +143,8 @@ protected:

 #elif defined(__WXGTK__)

+#include <gtk/gtk.h>
+
 class NativeWindow : public wxNativeWindow
 {
 public:
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -42,13 +42,8 @@
 #endif

 #ifdef __WXGTK__
-#include <gtk/gtk.h>
 #include "wx/renderer.h"
-#ifdef __WXGTK20__
-   #include "wx/gtk/private/gtk2-compat.h"
-#else
-   #define gtk_widget_is_drawable GTK_WIDGET_DRAWABLE
-#endif
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef __WXGTK3__
    #include "wx/graphics.h"
    #include "wx/gtk/private.h"
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -222,8 +222,7 @@ wxEND_EVENT_TABLE()
 #else
  // __WXGTK20__

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 static void
 gtk_pseudo_window_realized_callback( GtkWidget *m_widget, void *WXUNUSED(win) )
--- a/src/aui/tabartgtk.cpp
+++ b/src/aui/tabartgtk.cpp
@@ -36,8 +36,6 @@
 #include "wx/gtk/dc.h"
 #include "wx/gtk/private.h"

-#include <gtk/gtk.h>
-
 #include "wx/aui/auibook.h"
 #include "wx/aui/tabartgtk.h"
 #include "wx/renderer.h"
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -42,12 +42,7 @@
 #endif // __WXUNIVERSAL__

 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
-    #if GTK_CHECK_VERSION(2,0,0)
-        #include "wx/gtk/private/gtk2-compat.h"
-    #else
-        #define gtk_widget_get_window(x) x->window
-    #endif
+    #include "wx/gtk/private/wrapgtk.h"
 #elif defined(__WXMSW__)
    #include "wx/msw/private.h"
 #elif defined(__WXX11__)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -104,7 +104,7 @@
 #endif

 #if wxUSE_GUI && defined(__WXGTK__)
-    #include <gtk/gtk.h>    // for GTK_XXX_VERSION constants
+    #include "wx/gtk/private/wrapgtk.h"    // for GTK_XXX_VERSION constants
 #endif

 #if wxUSE_GUI && defined(__WXQT__)
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -83,7 +83,7 @@ using namespace std;
 #endif

 #ifdef __WXGTK__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/fontutil.h"
 #ifndef __WXGTK3__
 #include "wx/gtk/dc.h"
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -18,7 +18,7 @@
 #if wxUSE_SPLASH

 #ifdef __WXGTK20__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
 #endif

 #include "wx/splash.h"
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -27,9 +27,7 @@
 #endif

 #ifdef __WXGTK20__
-    #include <gtk/gtk.h>
    #include "wx/gtk/private.h"
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif

 // we only have to do it here when we use wxStatusBarGeneric in addition to the
--- a/src/gtk/aboutdlg.cpp
+++ b/src/gtk/aboutdlg.cpp
@@ -26,9 +26,7 @@
    #include "wx/window.h"
 #endif //WX_PRECOMP

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 // ----------------------------------------------------------------------------
 // GtkArray: temporary array of GTK strings
--- a/src/gtk/activityindicator.cpp
+++ b/src/gtk/activityindicator.cpp
@@ -28,8 +28,7 @@

 #include "wx/math.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 // Macro return the specified expression only if GTK+ run time version is less
 // than 2.20 and compiling it only if it is less than 3.0 (which is why this
--- a/src/gtk/animate.cpp
+++ b/src/gtk/animate.cpp
@@ -25,8 +25,6 @@
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/object.h"

-#include <gtk/gtk.h>
-

 // ============================================================================
 // implementation
--- a/src/gtk/anybutton.cpp
+++ b/src/gtk/anybutton.cpp
@@ -18,8 +18,7 @@

 #include "wx/stockitem.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // GTK callbacks
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -28,7 +28,6 @@
 #include "wx/apptrait.h"
 #include "wx/fontmap.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 #include "wx/gtk/mimetype.h"
--- a/src/gtk/artgtk.cpp
+++ b/src/gtk/artgtk.cpp
@@ -21,7 +21,6 @@

 #include "wx/artprov.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 #if !GTK_CHECK_VERSION(2,8,0)
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -10,10 +10,8 @@

 #if wxDEBUG_LEVEL

-#include <gtk/gtk.h>
-#include "wx/gtk/assertdlg_gtk.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private.h"
+#include "wx/gtk/assertdlg_gtk.h"
 #include "wx/gtk/private/mnemonics.h"
 #include "wx/translation.h"
 #include "wx/stockitem.h"
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -23,8 +23,6 @@
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private.h"

-#include <gtk/gtk.h>
-
 GdkWindow* wxGetTopLevelGDK();

 #ifndef __WXGTK3__
--- a/src/gtk/bmpcbox.cpp
+++ b/src/gtk/bmpcbox.cpp
@@ -29,7 +29,6 @@
    #include "wx/log.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 // ============================================================================
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -17,9 +17,7 @@

 #include "wx/stockitem.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/list.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/calctrl.cpp
+++ b/src/gtk/calctrl.cpp
@@ -19,7 +19,7 @@

 #include "wx/calctrl.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 extern "C" {

--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -13,8 +13,7 @@

 #include "wx/checkbox.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/eventsdisabler.h"

 //-----------------------------------------------------------------------------
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -14,7 +14,6 @@

 #include "wx/checklst.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/treeview.h"

--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -16,9 +16,7 @@
    #include "wx/arrstr.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/eventsdisabler.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -20,7 +20,7 @@

 #include "wx/clrpicker.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 // ============================================================================
 // implementation
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -23,9 +23,7 @@
 #include "wx/sizer.h"
 #include "wx/panel.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 // the lines below duplicate the same definitions in collpaneg.cpp, if we have
 // another implementation of this class we should extract them to a common file
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -23,9 +23,7 @@
    #include "wx/intl.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/dialogcount.h"

 extern "C" {
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -20,9 +20,7 @@
    #include "wx/arrstr.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 // ----------------------------------------------------------------------------
 // GTK callbacks
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -22,7 +22,6 @@
 #include "wx/utils.h"
 #include "wx/sysopt.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"

--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -18,9 +18,8 @@
    #include "wx/log.h"
 #endif // WX_PRECOMP

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"

 GdkWindow* wxGetTopLevelGDK();

--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -32,11 +32,9 @@
 #include "wx/gtk/dcclient.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/event.h"
 #include "wx/gtk/private/gdkconv.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/list.h"
 #include "wx/gtk/private/treeview.h"
 using namespace wxGTKImpl;
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -19,7 +19,7 @@
 #include "wx/icon.h"
 #include "wx/gtk/dc.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
    : wxGCDCImpl(owner)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -11,7 +11,7 @@

 #include "wx/gtk/dcmemory.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // wxMemoryDCImpl
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -11,7 +11,7 @@

 #include "wx/gtk/dcscreen.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // wxScreenDCImpl
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -19,8 +19,7 @@
 #include "wx/scopedptr.h"
 #include "wx/modalhook.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/dialogcount.h"

 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxGUIEventLoop)
--- a/src/gtk/display.cpp
+++ b/src/gtk/display.cpp
@@ -14,11 +14,10 @@
 #endif
 #include "wx/utils.h" // wxClientDisplayRect

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
    #include <gdk/gdkx.h>
 #endif
-#include "wx/gtk/private/gtk2-compat.h"

 #if !defined(GDK_WINDOWING_WIN32)

--- a/src/gtk/dnd.cpp
+++ b/src/gtk/dnd.cpp
@@ -24,8 +24,7 @@

 #include "wx/scopeguard.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 //----------------------------------------------------------------------------
 // global data
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -34,8 +34,7 @@
 #include "wx/private/eventloopsourcesmanager.h"
 #include "wx/apptrait.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 GdkWindow* wxGetTopLevelGDK();

--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -19,7 +19,6 @@
    #include "wx/msgdlg.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/mnemonics.h"

--- a/src/gtk/filehistory.cpp
+++ b/src/gtk/filehistory.cpp
@@ -28,10 +28,8 @@

 #include "wx/filename.h"

-#include <glib.h>
-#include <gtk/gtk.h>
-#include "wx/gtk/private/string.h"
 #include "wx/gtk/private.h"
+#include "wx/gtk/private/string.h"

 // ============================================================================
 // implementation
--- a/src/gtk/filepicker.cpp
+++ b/src/gtk/filepicker.cpp
@@ -25,7 +25,6 @@
 #include "wx/filepicker.h"
 #include "wx/tooltip.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 // ============================================================================
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -17,8 +17,7 @@
    #include "wx/statusbr.h"
 #endif // WX_PRECOMP

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // event tables
--- a/src/gtk/gauge.cpp
+++ b/src/gtk/gauge.cpp
@@ -13,7 +13,7 @@

 #include "wx/gauge.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // wxGauge
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -15,9 +15,8 @@

 #include "wx/glcanvas.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include <gdk/gdkx.h>
-#include "wx/gtk/private/gtk2-compat.h"

 #if WXWIN_COMPATIBILITY_2_8

--- a/src/gtk/hyperlink.cpp
+++ b/src/gtk/hyperlink.cpp
@@ -29,7 +29,6 @@
 #ifndef WX_PRECOMP
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -28,15 +28,14 @@
    #include "wx/tooltip.h"
 #endif

-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/eventsdisabler.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private/treeentry_gtk.h"
 #include "wx/gtk/private/treeview.h"

+#include <gdk/gdkkeysyms.h>
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -25,9 +25,7 @@
 #include "wx/accel.h"
 #include "wx/stockitem.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/mnemonics.h"

 // Number of currently open modal dialogs, defined in src/gtk/toplevel.cpp.
--- a/src/gtk/mimetype.cpp
+++ b/src/gtk/mimetype.cpp
@@ -13,11 +13,10 @@

 #include "wx/gtk/mimetype.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 #include "wx/gtk/private/string.h"
 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"

 #if defined(__UNIX__)
 wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -24,8 +24,7 @@
 #include "wx/gtk/dcclient.h"
 #endif

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/gtk3-compat.h"

 //-----------------------------------------------------------------------------
--- a/src/gtk/msgdlg.cpp
+++ b/src/gtk/msgdlg.cpp
@@ -25,7 +25,6 @@

 #include "wx/modalhook.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 #include "wx/gtk/private/mnemonics.h"
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -27,8 +27,7 @@

 #include "wx/nativewin.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 #ifdef GDK_WINDOWING_X11
    #include <gdk/gdkx.h>
--- a/src/gtk/nonownedwnd.cpp
+++ b/src/gtk/nonownedwnd.cpp
@@ -31,8 +31,7 @@

 #include "wx/graphics.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // wxNonOwnedWindowShapeImpl: base class for region and path-based classes.
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -24,9 +24,7 @@
 #include "wx/imaglist.h"
 #include "wx/fontutil.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 //-----------------------------------------------------------------------------
 // wxGtkNotebookPage
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -16,7 +16,7 @@
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 #include "wx/gtk/private/win_gtk.h"

--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -34,7 +34,7 @@
 #include "wx/paper.h"
 #include "wx/modalhook.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 #if GTK_CHECK_VERSION(2,14,0)
 #include <gtk/gtkunixprint.h>
@@ -46,7 +46,6 @@
 wxFORCE_LINK_THIS_MODULE(gtk_print)

 #include "wx/gtk/private/object.h"
-#include "wx/gtk/private/gtk2-compat.h"

 // Useful to convert angles from degrees to radians.
 static const double DEG2RAD  = M_PI / 180.0;
--- a/src/gtk/private.cpp
+++ b/src/gtk/private.cpp
@@ -27,7 +27,6 @@
    #include "wx/module.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -17,10 +17,9 @@
    #include "wx/tooltip.h"
 #endif

-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
+
+#include <gdk/gdkkeysyms.h>

 //-----------------------------------------------------------------------------
 // wxGTKRadioButtonInfo
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -13,9 +13,7 @@

 #include "wx/radiobut.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 //-----------------------------------------------------------------------------
 // data
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -37,9 +37,7 @@
 #include "wx/gtk/dc.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 #if defined(__WXGTK3__) && !GTK_CHECK_VERSION(3,14,0)
    #define GTK_STATE_FLAG_CHECKED (1 << 11)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -18,8 +18,7 @@

 #include "wx/scrolwin.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // wxScrollHelper implementation
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -20,9 +20,8 @@
 #include "wx/fontutil.h"
 #include "wx/fontenum.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/win_gtk.h"
-#include "wx/gtk/private/gtk2-compat.h"

 bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom);

--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -18,8 +18,7 @@
    #include "wx/math.h"
 #endif

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/eventsdisabler.h"

 //-----------------------------------------------------------------------------
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -14,7 +14,7 @@

 #include "wx/spinbutt.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // data
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -20,9 +20,7 @@
    #include "wx/wxcrtvararg.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"

 //-----------------------------------------------------------------------------
 // data
--- a/src/gtk/statbmp.cpp
+++ b/src/gtk/statbmp.cpp
@@ -13,7 +13,7 @@

 #include "wx/statbmp.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // wxStaticBitmap
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -13,8 +13,7 @@

 #include "wx/statbox.h"

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"
 #include "wx/gtk/private/win_gtk.h"

 // constants taken from GTK sources
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -13,8 +13,7 @@

 #if wxUSE_STATLINE

-#include <gtk/gtk.h>
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/wrapgtk.h"

 //-----------------------------------------------------------------------------
 // wxStaticLine
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -13,7 +13,6 @@

 #include "wx/stattext.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"

 //-----------------------------------------------------------------------------
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -23,14 +23,13 @@
    #include "wx/icon.h"
 #endif

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
    #include <gdk/gdkx.h>
 #endif
 #ifndef __WXGTK3__
    #include "eggtrayicon.h"
 #endif
-#include "wx/gtk/private/gtk2-compat.h"

 wxGCC_WARNING_SUPPRESS(deprecated-declarations)

--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -29,9 +29,7 @@
 #include <sys/stat.h>
 #include <ctype.h>

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -33,9 +33,7 @@

 #include "wx/textcompleter.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/object.h"
 #include "wx/gtk/private/string.h"

--- a/src/gtk/tglbtn.cpp
+++ b/src/gtk/tglbtn.cpp
@@ -20,7 +20,6 @@
    #include "wx/button.h"
 #endif

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/eventsdisabler.h"
 #include "wx/gtk/private/list.h"
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -14,7 +14,7 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/app.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"

 // ----------------------------------------------------------------------------
 // wxTimerImpl
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -14,9 +14,7 @@

 #include "wx/toolbar.h"

-#include <gtk/gtk.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"

 // ----------------------------------------------------------------------------
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -32,18 +32,16 @@
 #include "wx/evtloop.h"
 #include "wx/sysopt.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk3-compat.h"
+#include "wx/gtk/private/win_gtk.h"
+
 #ifdef GDK_WINDOWING_X11
    #include <gdk/gdkx.h>
    #include <X11/Xatom.h>  // XA_CARDINAL
    #include "wx/unix/utilsx11.h"
 #endif

-#include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
-#include "wx/gtk/private/gtk3-compat.h"
-#include "wx/gtk/private/win_gtk.h"
-
 // ----------------------------------------------------------------------------
 // data
 // ----------------------------------------------------------------------------
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -25,7 +25,7 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"

-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_WIN32
 #include <gdk/gdkwin32.h>
 #endif
@@ -54,8 +54,6 @@
    #include "wx/unix/utilsx11.h"
 #endif

-#include "wx/gtk/private/gtk2-compat.h"
-
 GdkWindow* wxGetTopLevelGDK();

 //----------------------------------------------------------------------------
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -8,13 +8,8 @@

 #include "wx/wxprec.h"

-#include "wx/defs.h"
-
-#include <gtk/gtk.h>
-#include "wx/gtk/private/win_gtk.h"
-
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/win_gtk.h"

 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -37,16 +37,15 @@

 #include <ctype.h>

-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
 #include "wx/gtk/private.h"
-#include "wx/gtk/private/gtk2-compat.h"
 #include "wx/gtk/private/gtk3-compat.h"
 #include "wx/gtk/private/event.h"
 #include "wx/gtk/private/win_gtk.h"
 #include "wx/private/textmeasure.h"
 using namespace wxGTKImpl;

+#include <gdk/gdkkeysyms.h>
+
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #include "wx/x11/private/wrapxkb.h"
--- a/src/unix/mediactrl.cpp
+++ b/src/unix/mediactrl.cpp
@@ -34,9 +34,8 @@
 #include "wx/vector.h"              // wxVector<wxString>

 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
    #include <gdk/gdkx.h>
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif

 //-----------------------------------------------------------------------------
--- a/src/unix/mediactrl_gstplayer.cpp
+++ b/src/unix/mediactrl_gstplayer.cpp
@@ -28,9 +28,8 @@
 #include "wx/vector.h"              // wxVector<wxString>

 #ifdef __WXGTK__
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
    #include <gdk/gdkx.h>
-    #include "wx/gtk/private/gtk2-compat.h"
 #endif

 //=============================================================================
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -64,7 +64,7 @@
 // ----------------------------------------------------------------------------

 #if defined(__WXGTK__)
-    #include <gtk/gtk.h>
+    #include "wx/gtk/private/wrapgtk.h"
    #include <gdk/gdkx.h>
    #define GetDisplay()        GDK_DISPLAY()
    #define GetXWindow(wxwin)   GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
--- a/src/unix/uiactionx11.cpp
+++ b/src/unix/uiactionx11.cpp
@@ -28,7 +28,7 @@
 #include "wx/unix/utilsx11.h"

 #ifdef __WXGTK3__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 GtkWidget* wxGetTopLevelGTK();
 #endif

--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -37,12 +37,9 @@
 #endif

 #ifdef __WXGTK__
-#include <gtk/gtk.h>
+#include "wx/gtk/private/wrapgtk.h"
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
-#ifdef __WXGTK20__
-#include "wx/gtk/private/gtk2-compat.h"     // gdk_window_get_screen()
-#endif
 #endif
 GdkWindow* wxGetTopLevelGDK();
 GtkWidget* wxGetTopLevelGTK();