Window: create a private header

Useful to #include other non-installed headers, to have the
corresponding types.

7 files changed, 33 insertions, 14 deletions

diff --git a/gedit/gedit-commands-documents.c b/gedit/gedit-commands-documents.c
index 34b78464b..be06c25eb 100644
--- a/gedit/gedit-commands-documents.c
+++ b/gedit/gedit-commands-documents.c
@@ -27,9 +27,8 @@
 
 #include <gtk/gtk.h>
 
-#include "gedit-window.h"
+#include "gedit-window-private.h"
 #include "gedit-notebook.h"
-#include "gedit-multi-notebook.h"
 #include "gedit-debug.h"
 
 void
@@ -84,7 +83,7 @@ _gedit_cmd_documents_new_tab_group (GSimpleAction *action,
                                     GVariant      *parameter,
                                     gpointer       user_data)
 {
-	gedit_multi_notebook_add_new_notebook (GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data))));
+	gedit_multi_notebook_add_new_notebook (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data)));
 }
 
 void
@@ -92,7 +91,7 @@ _gedit_cmd_documents_previous_tab_group (GSimpleAction *action,
                                          GVariant      *parameter,
                                          gpointer       user_data)
 {
-	gedit_multi_notebook_previous_notebook (GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data))));
+	gedit_multi_notebook_previous_notebook (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data)));
 }
 
 void
@@ -100,7 +99,7 @@ _gedit_cmd_documents_next_tab_group (GSimpleAction *action,
                                      GVariant      *parameter,
                                      gpointer       user_data)
 {
-	gedit_multi_notebook_next_notebook (GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data))));
+	gedit_multi_notebook_next_notebook (_gedit_window_get_multi_notebook (GEDIT_WINDOW (user_data)));
 }
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-documents-panel.c b/gedit/gedit-documents-panel.c
index 35126e4be..3e4f3477f 100644
--- a/gedit/gedit-documents-panel.c
+++ b/gedit/gedit-documents-panel.c
@@ -28,13 +28,13 @@
 #include "gedit-debug.h"
 #include "gedit-document.h"
 #include "gedit-document-private.h"
-#include "gedit-multi-notebook.h"
 #include "gedit-notebook.h"
 #include "gedit-notebook-popup-menu.h"
 #include "gedit-tab.h"
 #include "gedit-tab-private.h"
 #include "gedit-utils.h"
 #include "gedit-commands-private.h"
+#include "gedit-window-private.h"
 
 typedef struct _GeditDocumentsGenericRow GeditDocumentsGenericRow;
 typedef struct _GeditDocumentsGenericRow GeditDocumentsGroupRow;
@@ -717,7 +717,7 @@ set_window (GeditDocumentsPanel *panel,
             GeditWindow         *window)
 {
 	panel->window = g_object_ref (window);
-	panel->mnb = GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (window));
+	panel->mnb = _gedit_window_get_multi_notebook (window);
 
 	g_signal_connect (panel->mnb,
 	                  "notebook-removed",
diff --git a/gedit/gedit-notebook-popup-menu.c b/gedit/gedit-notebook-popup-menu.c
index 95ef4582e..e8362fd69 100644
--- a/gedit/gedit-notebook-popup-menu.c
+++ b/gedit/gedit-notebook-popup-menu.c
@@ -25,7 +25,7 @@
 #include "gedit-app.h"
 #include "gedit-app-private.h"
 #include "gedit-commands-private.h"
-#include "gedit-multi-notebook.h"
+#include "gedit-window-private.h"
 
 struct _GeditNotebookPopupMenu
 {
@@ -110,7 +110,7 @@ update_sensitivity (GeditNotebookPopupMenu *menu)
 
 	state = gedit_tab_get_state (menu->tab);
 
-	mnb = GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (menu->window));
+	mnb = _gedit_window_get_multi_notebook (menu->window);
 
 	notebook = GTK_NOTEBOOK (gedit_multi_notebook_get_notebook_for_tab (mnb, menu->tab));
 	n_pages = gtk_notebook_get_n_pages (notebook);
@@ -189,7 +189,7 @@ on_move_left_activate (GSimpleAction *action,
 	GtkNotebook *notebook;
 	gint page_num;
 
-	mnb = GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (menu->window));
+	mnb = _gedit_window_get_multi_notebook (menu->window);
 
 	notebook = GTK_NOTEBOOK (gedit_multi_notebook_get_notebook_for_tab (mnb, menu->tab));
 	page_num = gtk_notebook_page_num (notebook, GTK_WIDGET (menu->tab));
@@ -213,7 +213,7 @@ on_move_right_activate (GSimpleAction *action,
 	gint page_num;
 	gint n_pages;
 
-	mnb = GEDIT_MULTI_NOTEBOOK (_gedit_window_get_multi_notebook (menu->window));
+	mnb = _gedit_window_get_multi_notebook (menu->window);
 
 	notebook = GTK_NOTEBOOK (gedit_multi_notebook_get_notebook_for_tab (mnb, menu->tab));
 	n_pages = gtk_notebook_get_n_pages (notebook);
diff --git a/gedit/gedit-window-private.h b/gedit/gedit-window-private.h
new file mode 100644
index 000000000..6a72c313f
--- /dev/null
+++ b/gedit/gedit-window-private.h
@@ -0,0 +1,19 @@
+/* SPDX-FileCopyrightText: 2023 - Sébastien Wilmet <swilmet@gnome.org>
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#ifndef GEDIT_WINDOW_PRIVATE_H
+#define GEDIT_WINDOW_PRIVATE_H
+
+#include "gedit-window.h"
+#include "gedit-multi-notebook.h"
+
+G_BEGIN_DECLS
+
+GeditMultiNotebook *	_gedit_window_get_multi_notebook	(GeditWindow *window);
+
+G_END_DECLS
+
+#endif /* GEDIT_WINDOW_PRIVATE_H */
+
+/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index b9330f2f4..8e0d0ec6c 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include "gedit-window.h"
+#include "gedit-window-private.h"
 
 #include <time.h>
 #include <sys/types.h>
@@ -2898,12 +2899,12 @@ gedit_window_get_active_document (GeditWindow *window)
 	return GEDIT_DOCUMENT (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
 }
 
-GtkWidget *
+GeditMultiNotebook *
 _gedit_window_get_multi_notebook (GeditWindow *window)
 {
 	g_return_val_if_fail (GEDIT_IS_WINDOW (window), NULL);
 
-	return GTK_WIDGET (window->priv->multi_notebook);
+	return window->priv->multi_notebook;
 }
 
 GtkWidget *
diff --git a/gedit/gedit-window.h b/gedit/gedit-window.h
index 74195c1a5..f5ac19886 100644
--- a/gedit/gedit-window.h
+++ b/gedit/gedit-window.h
@@ -141,7 +141,6 @@ GeditMessageBus	*gedit_window_get_message_bus		(GeditWindow         *window);
 /*
  * Non exported functions
  */
-GtkWidget	*_gedit_window_get_multi_notebook	(GeditWindow         *window);
 GtkWidget	*_gedit_window_get_notebook		(GeditWindow         *window);
 
 GMenuModel	*_gedit_window_get_hamburger_menu	(GeditWindow         *window);
diff --git a/gedit/meson.build b/gedit/meson.build
index 6dbdf499e..4bd2a6e35 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -70,6 +70,7 @@ libgedit_private_headers = [
   'gedit-status-menu-button.h',
   'gedit-tab-label.h',
   'gedit-view-frame.h',
+  'gedit-window-private.h',
 ]
 
 libgedit_private_sources = [