Update.

2000-10-09  Tor Lillqvist  <tml@iki.fi>

	* README.win32: Update.

	* gdk/win32/gdkgeometry-win32.c (gdk_window_clip_changed): Add two
	lines that had been deleted by mistake (?).

	* gdk/win32/gdkcursor-win32.c (gdk_cursor_new_from_pixmap): Handle
	also the case fg==white and bg==black (but still not randomly
	coloured cursors). Thanks to Wolfgang Sourdeau.

	* gdk/win32/*.c: Silence gcc -Wall.

	* gtk/gtk.def: Add missing entry points.

	Fixes by Hans Breuer:

	* gdk/makefile.msc
	* gdk/win32/makefile.msc: Update.

	* gdk/testgdk.c: If compiling with debugging (with _DEBUG defined,
	some MSVC thing, presumably), cause breakpoint on failures. Add
	GDK_NOR case. Call g_log_set_always_fatal.

	* gdk/win32/gdkwin32id.c (gdk_win32_handle_table_insert): Handle
	should be pased by reference.

	* gdk/win32/gdkprivate-win32.h: Correct declaration accordingly.

	* gdk/win32/*.c: Correct calls to gdk_win32_handle_table_insert.

	* gdk/win32/gdkevents-win32.c
	* gdk/win32/gdkwindow-win32.c: Handle WM_CREATE.

	* gdk/win32/gdkgc-win32.c: Fix mixups of drawable and
	implementation object.

	* gdk/win32/gdkimage-win32.c (gdk_image_get): Handle drawables,
	not just windows.

	* gdk/win32/gdkpixmap-win32.c (gdk_pixmap_impl_win32_finalize):
	Use the wrapper object.

1 files changed, 8 insertions, 9 deletions

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 43e135599..42e2cd307 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -791,7 +791,7 @@ target_context_new (void)
   result->context = gdk_drag_context_new ();
   result->context->is_source = FALSE;
 
-  GDK_NOTE (DND, g_print ("target_context_new: %#x\n", result));
+  GDK_NOTE (DND, g_print ("target_context_new: %p\n", result));
 
   return result;
 }
@@ -810,7 +810,7 @@ source_context_new (void)
   result->context = gdk_drag_context_new ();
   result->context->is_source = TRUE;
 
-  GDK_NOTE (DND, g_print ("source_context_new: %#x\n", result));
+  GDK_NOTE (DND, g_print ("source_context_new: %p\n", result));
 
   return result;
 }
@@ -951,7 +951,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
   MSG *msg = (MSG *) xev;
   HANDLE hdrop;
   POINT pt;
-  gint nfiles, i, k;
+  gint nfiles, i;
   guchar fileName[MAX_PATH], linkedFile[MAX_PATH];
   
   if (text_uri_list_atom == GDK_NONE)
@@ -959,7 +959,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
 
   if (msg->message == WM_DROPFILES)
     {
-      GDK_NOTE (DND, g_print ("WM_DROPFILES: %#x\n", msg->hwnd));
+      GDK_NOTE (DND, g_print ("WM_DROPFILES: %#x\n", (guint) msg->hwnd));
 
       context = gdk_drag_context_new ();
       private = PRIVATE_DATA (context);
@@ -1075,9 +1075,9 @@ GdkDragContext *
 gdk_drag_begin (GdkWindow *window,
 		GList     *targets)
 {
-  GList *tmp_list;
   source_drag_context *ctx;
 #ifdef OLE2_DND
+  GList *tmp_list;
   data_object *dobj;
   HRESULT hResult;
   DWORD dwEffect;
@@ -1149,12 +1149,11 @@ gdk_drag_find_window (GdkDragContext  *context,
 		      GdkWindow      **dest_window,
 		      GdkDragProtocol *protocol)
 {
-  GdkDragContextPrivateWin32 *private = PRIVATE_DATA (context);
   HWND recipient;
   POINT pt;
 
   GDK_NOTE (DND, g_print ("gdk_drag_find_window: %#x +%d+%d\n",
-			  (drag_window ? GDK_WINDOW_HWND (drag_window) : 0),
+			  (drag_window ? (guint) GDK_WINDOW_HWND (drag_window) : 0),
 			  x_root, y_root));
 
   pt.x = x_root;
@@ -1164,7 +1163,7 @@ gdk_drag_find_window (GdkDragContext  *context,
     *dest_window = NULL;
   else
     {
-      *dest_window = gdk_win32_handle_table_lookup (recipient);
+      *dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT(recipient));
       if (*dest_window)
 	gdk_drawable_ref (*dest_window);
       *protocol = GDK_DRAG_PROTO_WIN32_DROPFILES;
@@ -1266,7 +1265,7 @@ gdk_window_register_dnd (GdkWindow *window)
   g_return_if_fail (window != NULL);
 
   GDK_NOTE (DND, g_print ("gdk_window_register_dnd: %#x\n",
-			  GDK_WINDOW_HWND (window)));
+			  (guint) GDK_WINDOW_HWND (window)));
 
   /* We always claim to accept dropped files, but in fact we might not,
    * of course. This function is called in such a way that it cannot know