Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to create new images to scan with gdk_image_get(). Use the

Browse Source 
2002-02-16  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
	need to create new images to scan with gdk_image_get(). Use the
	GdkImage view of the GdkPixmap always present nowadays with the
	unified GdkPixmap-GdkImage implementation.

	* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.

	* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
	Simoncic for providing the nice multi-resolution .ico file.
This commit is contained in:
Tor Lillqvist
2002-02-15 23:23:56 +00:00
committed by Tor Lillqvist
parent 84d9defe96
commit 4ea98cbe1a
8 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-0
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-10
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-2
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-4
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-6
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

12
ChangeLog.pre-2-8
View File

@@ -1,3 +1,15 @@
2002-02-16 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): No
need to create new images to scan with gdk_image_get(). Use the
GdkImage view of the GdkPixmap always present nowadays with the
unified GdkPixmap-GdkImage implementation.
* gdk/win32/rc/Makefile.am (gdk-win32res.lo): Depend on gtk.ico.
* gdk/win32/rc/gtk.ico: Use the real GTK logo. Thanks to Jernej
Simoncic for providing the multi-resolution .ico file.
2002-02-15 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkdrawable-win32.c (gdk_win32_drawable_description):

16
gdk/win32/gdkcursor-win32.c
View File

@@ -155,16 +155,11 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
residue = (1 << ((8-(width%8))%8)) - 1;
source_image = gdk_image_get (source, 0, 0, width, height);
mask_image = gdk_image_get (mask, 0, 0, width, height);
source_image = GDK_DRAWABLE_WIN32DATA (source)->image;
mask_image = GDK_DRAWABLE_WIN32DATA (mask)->image;
if (source_image->depth != 1 || mask_image->depth != 1)
{
gdk_image_unref (source_image);
gdk_image_unref (mask_image);
g_return_val_if_fail (source_image->depth == 1 && mask_image->depth == 1,
NULL);
}
g_return_val_if_fail (source_image->depth == 1 && mask_image->depth == 1,
NULL);
#ifdef G_ENABLE_DEBUG
if (gdk_debug_flags & GDK_DEBUG_CURSOR)
@@ -277,9 +272,6 @@ gdk_cursor_new_from_pixmap (GdkPixmap *source,
g_free (XORmask);
g_free (ANDmask);
gdk_image_unref (source_image);
gdk_image_unref (mask_image);
private = g_new (GdkCursorPrivate, 1);
private->xcursor = xcursor;
cursor = (GdkCursor*) private;