diff --git a/ChangeLog b/ChangeLog index 9f63bee543..b07574793d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9f63bee543..b07574793d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2002-02-14 Tor Lillqvist + + * gdk/win32/Makefile.am (libgdk_win32_la_SOURCES): Mention + gdkinputprivate.h. + + * gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Use + g_filename_to_uri() to actually create legal URIs in the + text/uri-list data. + +2002-02-11 Tor Lillqvist + + * gdk/win32/gdkimage-win32.c (gdk_image_new_bitmap): Remove unused + variable private. + 2002-02-10 Tor Lillqvist * gtk/gtk.def: Add a couple of missing entry points. diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index c7a4bd6cc6..1cf2a5e10a 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -59,6 +59,7 @@ libgdk_win32_la_SOURCES = \ gdkim-win32.c \ gdkimage-win32.c \ gdkinput-win32.c \ + gdkinputprivate.h \ gdkmain-win32.c \ gdkpixmap-win32.c \ gdkprivate-win32.h \ diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 34b9751ee9..787ec06907 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -673,20 +673,31 @@ gdk_dropfiles_filter (GdkXEvent *xev, result = g_string_new (NULL); for (i = 0; i < nfiles; i++) { - g_string_append (result, "file:"); + gchar *uri; + DragQueryFile (hdrop, i, fileName, MAX_PATH); /* Resolve shortcuts */ if (resolve_link (msg->hwnd, fileName, linkedFile, NULL)) { - g_string_append (result, linkedFile); - GDK_NOTE (DND, g_print ("...%s link to %s\n", - fileName, linkedFile)); + uri = g_filename_to_uri (linkedFile, NULL, NULL); + if (uri != NULL) + { + g_string_append (result, uri); + GDK_NOTE (DND, g_print ("...%s link to %s: %s\n", + fileName, linkedFile, uri)); + g_free (uri); + } } else { - g_string_append (result, fileName); - GDK_NOTE (DND, g_print ("...%s\n", fileName)); + uri = g_filename_to_uri (fileName, NULL, NULL); + if (uri != NULL) + { + g_string_append (result, uri); + GDK_NOTE (DND, g_print ("...%s: %s\n", fileName, uri)); + g_free (uri); + } } g_string_append (result, "\015\012"); } diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c index ad222cc91d..de80f83690 100644 --- a/gdk/win32/gdkimage-win32.c +++ b/gdk/win32/gdkimage-win32.c @@ -79,13 +79,9 @@ gdk_image_new_bitmap (GdkVisual *visual, gpointer data, gint width, gint height) -/* - * Desc: create a new bitmap image - */ { GdkPixmap *pixmap; GdkImage *image; - GdkImagePrivateWin32 *private; gint data_bpl = (width - 1)/8 + 1; gint i; @@ -95,7 +91,6 @@ gdk_image_new_bitmap (GdkVisual *visual, return NULL; image = GDK_DRAWABLE_WIN32DATA (pixmap)->image; - private = (GdkImagePrivateWin32 *) image; GDK_NOTE (IMAGE, g_print ("gdk_image_new_bitmap: %dx%d\n", width, height)); @@ -196,7 +191,7 @@ gdk_image_get_pixel (GdkImage *image, GdiFlush (); if (image->depth == 1) - return (((char *) image->mem)[y * image->bpl + (x >> 3)] & (1 << (7 - (x & 0x7)))) != 0; + return (((guchar *) image->mem)[y * image->bpl + (x >> 3)] & (1 << (7 - (x & 0x7)))) != 0; if (image->depth == 4) {