From 99b5586acce5b79c760a15deb1c534f9d2ee2638 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sun, 18 Sep 2005 17:46:55 +0000 Subject: [PATCH] export _gdk_win32_pixbuf_to_hicon() as 2005-09-18 Hans Breuer * gdk/gdk.symbols gdk/win32/gdkwin32.h gdk/win32/gdkcursorwin32.c : export _gdk_win32_pixbuf_to_hicon() as gdk_win32_pixbuf_to_hicon_libgtk_only() * gtk/gtktrayicon-win32.c : a lot of debug spew but it has started to show the icon and is blinking with teststatusicon. More to come ... --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gdk/gdk.symbols | 1 + gdk/win32/gdkcursor-win32.c | 6 ++++++ gdk/win32/gdkwin32.h | 1 + 5 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 82f53a424d..9624e6e727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-18 Hans Breuer + + * gdk/gdk.symbols gdk/win32/gdkwin32.h gdk/win32/gdkcursorwin32.c : export + _gdk_win32_pixbuf_to_hicon() as gdk_win32_pixbuf_to_hicon_libgtk_only() + * gtk/gtktrayicon-win32.c : a lot of debug spew but it has started to show + the icon and is blinking with teststatusicon. More to come ... + 2005-09-18 Hans Breuer * gtk/makefile.msc.in : fix typo for GTK_VER; define HAVE_CONFIG_H diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 82f53a424d..9624e6e727 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-09-18 Hans Breuer + + * gdk/gdk.symbols gdk/win32/gdkwin32.h gdk/win32/gdkcursorwin32.c : export + _gdk_win32_pixbuf_to_hicon() as gdk_win32_pixbuf_to_hicon_libgtk_only() + * gtk/gtktrayicon-win32.c : a lot of debug spew but it has started to show + the icon and is blinking with teststatusicon. More to come ... + 2005-09-18 Hans Breuer * gtk/makefile.msc.in : fix typo for GTK_VER; define HAVE_CONFIG_H diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols index efcccc41d7..3335349d28 100644 --- a/gdk/gdk.symbols +++ b/gdk/gdk.symbols @@ -1076,6 +1076,7 @@ gdk_win32_handle_table_lookup #if IN_HEADER(__GDK_WIN32_H__) #if IN_FILE(__GDK_CURSOR_WIN32_C__) gdk_win32_icon_to_pixbuf_libgtk_only +gdk_win32_pixbuf_to_hicon_libgtk_only #endif #endif diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index 54af4a82ce..85e7fb6f30 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -818,3 +818,9 @@ _gdk_win32_pixbuf_to_hicon_supports_alpha (void) } return is_win_xp; } + +HICON +gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf) +{ + return _gdk_win32_pixbuf_to_hicon (pixbuf); +} \ No newline at end of file diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h index c34bac114a..37e6cbc762 100644 --- a/gdk/win32/gdkwin32.h +++ b/gdk/win32/gdkwin32.h @@ -86,6 +86,7 @@ void gdk_win32_selection_add_targets (GdkWindow *owner, /* For internal GTK use only */ GdkPixbuf * gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon); +HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf); G_END_DECLS