[gtkmm] Gtk::Application, Window: Swap inclusions

[Kjell Ahlstedt <kjellahl src gnome org>]

commit ba9a6c8606697b2f45e4ad4555e19de282b2a27b
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date:   Fri Aug 27 16:20:20 2021 +0200

    Gtk::Application, Window: Swap inclusions
    
    Include window.h in application.h instead of application.h in window.h.
    clang++ reports a possible error when the full declaration of Window
    is not available in template method Application::make_window_and_run().

 gtk/src/application.hg       | 3 +--
 gtk/src/applicationwindow.hg | 1 +
 gtk/src/window.ccg           | 1 +
 gtk/src/window.hg            | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/src/application.hg b/gtk/src/application.hg
index 4039d2c4..1d1f7c6c 100644
--- a/gtk/src/application.hg
+++ b/gtk/src/application.hg
@@ -23,6 +23,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <giomm/application.h>
 #include <giomm/menumodel.h>
 #include <giomm/menu.h>
+#include <gtkmm/window.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(giomm/private/application_p.h)
@@ -35,8 +36,6 @@ typedef struct _GtkWindow GtkWindow;
 namespace Gtk
 {
 
-class GTKMM_API Window;
-
 //TODO: Add overview documentation discussing the techniques show in the examples in gtkmm-docmentation.
 //TODO: Add the screenshots from the C API?
 
diff --git a/gtk/src/applicationwindow.hg b/gtk/src/applicationwindow.hg
index 6024827c..bc66df4b 100644
--- a/gtk/src/applicationwindow.hg
+++ b/gtk/src/applicationwindow.hg
@@ -20,6 +20,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
 #include <gtkmm/window.h>
 #include <giomm/actiongroup.h>
 #include <giomm/actionmap.h>
+#include <gtkmm/application.h>
 
 _DEFS(gtkmm,gtk)
 _PINCLUDE(gtkmm/private/window_p.h)
diff --git a/gtk/src/window.ccg b/gtk/src/window.ccg
index e2f756bb..21300d9f 100644
--- a/gtk/src/window.ccg
+++ b/gtk/src/window.ccg
@@ -19,6 +19,7 @@
 #include <glibmm/vectorutils.h>
 #include <giomm/listmodel.h>
 #include <gdkmm/monitor.h>
+#include <gtkmm/application.h>
 #include <gtk/gtk.h>
 
 namespace Gtk
diff --git a/gtk/src/window.hg b/gtk/src/window.hg
index c5bf4bae..4198903a 100644
--- a/gtk/src/window.hg
+++ b/gtk/src/window.hg
@@ -25,7 +25,6 @@
 #include <gtkmm/native.h>
 #include <gtkmm/root.h>
 #include <gtkmm/shortcutmanager.h>
-#include <gtkmm/application.h>
 #include <gtkmm/windowgroup.h>
 
 _DEFS(gtkmm,gtk)
@@ -39,6 +38,7 @@ class GTKMM_API ListModel;
 namespace Gtk
 {
 
+class GTKMM_API Application;
 class GTKMM_API WindowGroup;
 
 /** Toplevel %Window.