diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-08-24 15:44:32 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-08-24 15:44:32 +0400 |
| commit | 6cfb6e0c9c4cc5b71954e05b1a988fac8f99f194 (patch) | |
| tree | 1427d75abae01f2cc6cf010f536d4580645f2815 | |
| parent | ef831235fe20274f6ee8835509dfaf5964bf72f1 (diff) | |
| download | gtk+-6cfb6e0c9c4cc5b71954e05b1a988fac8f99f194.tar.gz | |
gdk/win32: do not expose gdk_win32_*_libgtk_only in public headers
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
| -rw-r--r-- | gdk/win32/gdkprivate-win32.h | 6 | ||||
| -rw-r--r-- | gdk/win32/gdkwin32misc.h | 14 | ||||
| -rw-r--r-- | gtk/gtkicontheme.c | 1 | ||||
| -rw-r--r-- | 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 |