[gtk: 1/4] gdk/win32: do not expose gdk_win32_*_libgtk_only in public headers
- From: Luca Bacci <lbacci src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/4] gdk/win32: do not expose gdk_win32_*_libgtk_only in public headers
- Date: Fri, 26 Aug 2022 13:14:32 +0000 (UTC)
commit 6cfb6e0c9c4cc5b71954e05b1a988fac8f99f194
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Wed Aug 24 15:44:32 2022 +0400
gdk/win32: do not expose gdk_win32_*_libgtk_only in public headers
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
gdk/win32/gdkprivate-win32.h | 6 ++++++
gdk/win32/gdkwin32misc.h | 14 --------------
gtk/gtkicontheme.c | 1 +
gtk/gtkprintoperation-win32.c | 1 +
4 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 3ba99dce83..c8bf213b72 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -441,4 +441,10 @@ typedef enum _GdkWin32ProcessorCheckType
gboolean _gdk_win32_check_processor (GdkWin32ProcessorCheckType check_type);
+GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
+ double *x_hot,
+ double *y_hot);
+HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf);
+void gdk_win32_set_modal_dialog_libgtk_only (HWND window);
+
#endif /* __GDK_PRIVATE_WIN32_H__ */
diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index 990b8d0156..404a3baba0 100644
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -84,20 +84,6 @@ GDK_AVAILABLE_IN_ALL
GdkSurface * gdk_win32_surface_lookup_for_display (GdkDisplay *display,
HWND anid);
-#if defined (INSIDE_GDK_WIN32) || defined (GTK_COMPILATION) || defined (GTK_COMPILATION)
-
-/* For internal GTK use only */
-GDK_AVAILABLE_IN_ALL
-GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
- double *x_hot,
- double *y_hot);
-GDK_AVAILABLE_IN_ALL
-HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf);
-GDK_AVAILABLE_IN_ALL
-void gdk_win32_set_modal_dialog_libgtk_only (HWND window);
-
-#endif
-
G_END_DECLS
#endif /* __GDK_WIN32_MISC_H__ */
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 4cc8387d66..4c39604132 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -36,6 +36,7 @@
#include <windows.h>
#include <shellapi.h>
#include "win32/gdkwin32.h"
+#include "win32/gdkprivate-win32.h"
#endif /* G_OS_WIN32 */
#include "gtkiconthemeprivate.h"
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 43d63bb815..b9ef0bf9aa 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -45,6 +45,7 @@
#include "gtkprivate.h"
#include "gtkwidgetprivate.h"
#include "gtknative.h"
+#include "win32/gdkprivate-win32.h"
#define MAX_PAGE_RANGES 20
#define STATUS_POLLING_TIME 2000
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]