Add new keysyms from X11R6.4 (including EuroSign).

[~andy/gtk] / gdk / win32 / gdkdnd-win32.c

diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 45891291734be07c7ed1457b5957b72927056779..1c7f42a99db5a73da0d6cb5732db63063a4d3276 100644 (file)
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -38,6 +38,8 @@
 
 #ifdef OLE2_DND
 #include <ole2.h>
+#else
+#include <objbase.h>
 #endif
 
 #ifdef _MSC_VER                        /* These aren't in mingw32 */
@@ -596,7 +598,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
       private = (GdkDragContextPrivate *) context;
       context->protocol = GDK_DRAG_PROTO_WIN32_DROPFILES;
       context->is_source = FALSE;
-      context->source_window = (GdkWindow *) &gdk_root_parent;
+      context->source_window = (GdkWindow *) gdk_root_parent;
       context->dest_window = event->any.window;
       gdk_window_ref (context->dest_window);
       /* WM_DROPFILES drops are always file names */
@@ -638,7 +640,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
            }
          g_string_append (result, "\015\012");
        }
-      gdk_sel_prop_store ((GdkWindow *) &gdk_root_parent,
+      gdk_sel_prop_store ((GdkWindow *) gdk_root_parent,
                          text_uri_list_atom, 8, result->str, result->len + 1);
 
       DragFinish (hdrop);
@@ -733,7 +735,7 @@ gdk_drag_find_window (GdkDragContext  *context,
                      GdkDragProtocol *protocol)
 {
   GdkDragContextPrivate *private = (GdkDragContextPrivate *)context;
-  GdkWindowPrivate *drag_window_private = (GdkWindowPrivate *) drag_window;
+  GdkDrawablePrivate *drag_window_private = (GdkDrawablePrivate*) drag_window;
   HWND recipient;
   POINT pt;
 
@@ -833,7 +835,7 @@ gdk_destroy_filter (GdkXEvent *xev,
 void
 gdk_window_register_dnd (GdkWindow      *window)
 {
-  GdkWindowPrivate *private = (GdkWindowPrivate *) window;
+  GdkDrawablePrivate *private = (GdkDrawablePrivate *) window;
 #ifdef OLE2_DND
   target_drag_context *context;
   HRESULT hres;