export _gdk_win32_pixbuf_to_hicon() as

2005-09-18  Hans Breuer  <hans@breuer.org>

	* 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 ...

diff --git a/ChangeLog b/ChangeLog
index 82f53a424dbcdf605677240bc849bdfea8f941a8..9624e6e7273a634c2d58003467e54fd9b282d7c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-18  Hans Breuer  <hans@breuer.org>
+
+       * 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  <hans@breuer.org>
 
        * 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 82f53a424dbcdf605677240bc849bdfea8f941a8..9624e6e7273a634c2d58003467e54fd9b282d7c4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-09-18  Hans Breuer  <hans@breuer.org>
+
+       * 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  <hans@breuer.org>
 
        * gtk/makefile.msc.in : fix typo for GTK_VER; define HAVE_CONFIG_H

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index efcccc41d7dd79987b58513d756b9faa6f00b840..3335349d28f3181c30a6c16a4208c6912ff1fdb1 100644 (file)
--- 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 54af4a82cefd2665d979fb3c474694714990ed2e..85e7fb6f30641b94fc14cda7a9e5f084056751d8 100644 (file)
--- 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 c34bac114aa8806d4d95be51c51f6e6a2fa35bfc..37e6cbc762076b150a11c51f9e12d9a681dc914d 100644 (file)
--- 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