diff --git a/ChangeLog b/ChangeLog index 71f22f6578..7c83634901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-06-30 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (find_window_enum_proc): New function, + callback proc for EnumWindows(). + (gdk_drag_find_window_for_screen): Actually take the drag_window + argument into account: Instead of using WindowFromPoint(), use + EnumWindows(), to be able to skip the drag_window. (#116320, Tony + M Brown, Herman Bloggs) + + * gdk/win32/*.c: Replace gdk_drawable_ref()/unref() and + gdk_window_ref()/unref() calls with g_object_ref()/unref(). + Consistently use %p format in debugging output of pointers and + HANDLEs. + 2003-06-28 Tor Lillqvist Fix for #111028, thanks to J. Ali Harlow, who writes: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 71f22f6578..7c83634901 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2003-06-30 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (find_window_enum_proc): New function, + callback proc for EnumWindows(). + (gdk_drag_find_window_for_screen): Actually take the drag_window + argument into account: Instead of using WindowFromPoint(), use + EnumWindows(), to be able to skip the drag_window. (#116320, Tony + M Brown, Herman Bloggs) + + * gdk/win32/*.c: Replace gdk_drawable_ref()/unref() and + gdk_window_ref()/unref() calls with g_object_ref()/unref(). + Consistently use %p format in debugging output of pointers and + HANDLEs. + 2003-06-28 Tor Lillqvist Fix for #111028, thanks to J. Ali Harlow, who writes: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 71f22f6578..7c83634901 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2003-06-30 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (find_window_enum_proc): New function, + callback proc for EnumWindows(). + (gdk_drag_find_window_for_screen): Actually take the drag_window + argument into account: Instead of using WindowFromPoint(), use + EnumWindows(), to be able to skip the drag_window. (#116320, Tony + M Brown, Herman Bloggs) + + * gdk/win32/*.c: Replace gdk_drawable_ref()/unref() and + gdk_window_ref()/unref() calls with g_object_ref()/unref(). + Consistently use %p format in debugging output of pointers and + HANDLEs. + 2003-06-28 Tor Lillqvist Fix for #111028, thanks to J. Ali Harlow, who writes: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 71f22f6578..7c83634901 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2003-06-30 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (find_window_enum_proc): New function, + callback proc for EnumWindows(). + (gdk_drag_find_window_for_screen): Actually take the drag_window + argument into account: Instead of using WindowFromPoint(), use + EnumWindows(), to be able to skip the drag_window. (#116320, Tony + M Brown, Herman Bloggs) + + * gdk/win32/*.c: Replace gdk_drawable_ref()/unref() and + gdk_window_ref()/unref() calls with g_object_ref()/unref(). + Consistently use %p format in debugging output of pointers and + HANDLEs. + 2003-06-28 Tor Lillqvist Fix for #111028, thanks to J. Ali Harlow, who writes: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 71f22f6578..7c83634901 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2003-06-30 Tor Lillqvist + + * gdk/win32/gdkdnd-win32.c (find_window_enum_proc): New function, + callback proc for EnumWindows(). + (gdk_drag_find_window_for_screen): Actually take the drag_window + argument into account: Instead of using WindowFromPoint(), use + EnumWindows(), to be able to skip the drag_window. (#116320, Tony + M Brown, Herman Bloggs) + + * gdk/win32/*.c: Replace gdk_drawable_ref()/unref() and + gdk_window_ref()/unref() calls with g_object_ref()/unref(). + Consistently use %p format in debugging output of pointers and + HANDLEs. + 2003-06-28 Tor Lillqvist Fix for #111028, thanks to J. Ali Harlow, who writes: diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 08cdcdef3e..b681562b21 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -165,11 +165,11 @@ gdk_drag_context_finalize (GObject *object) if (context->source_window) { - gdk_window_unref (context->source_window); + g_object_unref (context->source_window); } if (context->dest_window) - gdk_window_unref (context->dest_window); + g_object_unref (context->dest_window); contexts = g_list_remove (contexts, context); @@ -268,7 +268,7 @@ idroptarget_addref (LPDROPTARGET This) int ref_count = ++private->ref_count; gdk_drag_context_ref (ctx->context); - GDK_NOTE (DND, g_print ("idroptarget_addref %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("idroptarget_addref %p %d\n", This, ref_count)); return ref_count; } @@ -278,7 +278,7 @@ idroptarget_queryinterface (LPDROPTARGET This, REFIID riid, LPVOID *ppvObject) { - GDK_NOTE (DND, g_print ("idroptarget_queryinterface %#x\n", This)); + GDK_NOTE (DND, g_print ("idroptarget_queryinterface %p\n", This)); *ppvObject = NULL; @@ -313,7 +313,7 @@ idroptarget_release (LPDROPTARGET This) int ref_count = --private->ref_count; gdk_drag_context_unref (ctx->context); - GDK_NOTE (DND, g_print ("idroptarget_release %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("idroptarget_release %p %d\n", This, ref_count)); if (ref_count == 0) g_free (This); @@ -328,7 +328,7 @@ idroptarget_dragenter (LPDROPTARGET This, POINTL pt, LPDWORD pdwEffect) { - GDK_NOTE (DND, g_print ("idroptarget_dragenter %#x\n", This)); + GDK_NOTE (DND, g_print ("idroptarget_dragenter %p\n", This)); return E_UNEXPECTED; } @@ -339,7 +339,7 @@ idroptarget_dragover (LPDROPTARGET This, POINTL pt, LPDWORD pdwEffect) { - GDK_NOTE (DND, g_print ("idroptarget_dragover %#x\n", This)); + GDK_NOTE (DND, g_print ("idroptarget_dragover %p\n", This)); return E_UNEXPECTED; } @@ -347,7 +347,7 @@ idroptarget_dragover (LPDROPTARGET This, static HRESULT STDMETHODCALLTYPE idroptarget_dragleave (LPDROPTARGET This) { - GDK_NOTE (DND, g_print ("idroptarget_dragleave %#x\n", This)); + GDK_NOTE (DND, g_print ("idroptarget_dragleave %p\n", This)); return E_UNEXPECTED; } @@ -359,7 +359,7 @@ idroptarget_drop (LPDROPTARGET This, POINTL pt, LPDWORD pdwEffect) { - GDK_NOTE (DND, g_print ("idroptarget_drop %#x\n", This)); + GDK_NOTE (DND, g_print ("idroptarget_drop %p\n", This)); return E_UNEXPECTED; } @@ -371,7 +371,7 @@ idropsource_addref (LPDROPSOURCE This) GdkDragContextPrivateWin32 *private = GDK_DRAG_CONTEXT_PRIVATE_DATA (ctx->context); gdk_drag_context_ref (ctx->context); - GDK_NOTE (DND, g_print ("idropsource_addref %#x %d\n", + GDK_NOTE (DND, g_print ("idropsource_addref %p %d\n", This, private->ref_count)); return private->ref_count; @@ -382,7 +382,7 @@ idropsource_queryinterface (LPDROPSOURCE This, REFIID riid, LPVOID *ppvObject) { - GDK_NOTE (DND, g_print ("idropsource_queryinterface %#x\n", This)); + GDK_NOTE (DND, g_print ("idropsource_queryinterface %p\n", This)); *ppvObject = NULL; @@ -416,7 +416,7 @@ idropsource_release (LPDROPSOURCE This) int ref_count = --private->ref_count; gdk_drag_context_unref (ctx->context); - GDK_NOTE (DND, g_print ("idropsource_release %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("idropsource_release %p %d\n", This, ref_count)); if (ref_count == 0) g_free (This); @@ -429,7 +429,7 @@ idropsource_querycontinuedrag (LPDROPSOURCE This, BOOL fEscapePressed, DWORD grfKeyState) { - GDK_NOTE (DND, g_print ("idropsource_querycontinuedrag %#x\n", This)); + GDK_NOTE (DND, g_print ("idropsource_querycontinuedrag %p\n", This)); return E_UNEXPECTED; } @@ -438,7 +438,7 @@ static HRESULT STDMETHODCALLTYPE idropsource_givefeedback (LPDROPSOURCE This, DWORD dwEffect) { - GDK_NOTE (DND, g_print ("idropsource_givefeedback %#x\n", This)); + GDK_NOTE (DND, g_print ("idropsource_givefeedback %p\n", This)); return E_UNEXPECTED; } @@ -449,7 +449,7 @@ idataobject_addref (LPDATAOBJECT This) data_object *dobj = (data_object *) This; int ref_count = ++dobj->ref_count; - GDK_NOTE (DND, g_print ("idataobject_addref %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("idataobject_addref %p %d\n", This, ref_count)); return ref_count; } @@ -459,7 +459,7 @@ idataobject_queryinterface (LPDATAOBJECT This, REFIID riid, LPVOID *ppvObject) { - GDK_NOTE (DND, g_print ("idataobject_queryinterface %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_queryinterface %p\n", This)); *ppvObject = NULL; @@ -491,7 +491,7 @@ idataobject_release (LPDATAOBJECT This) data_object *dobj = (data_object *) This; int ref_count = --dobj->ref_count; - GDK_NOTE (DND, g_print ("idataobject_release %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("idataobject_release %p %d\n", This, ref_count)); if (ref_count == 0) g_free (This); @@ -504,7 +504,7 @@ idataobject_getdata (LPDATAOBJECT This, LPFORMATETC pFormatEtc, LPSTGMEDIUM pMedium) { - GDK_NOTE (DND, g_print ("idataobject_getdata %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_getdata %p\n", This)); return E_UNEXPECTED; } @@ -514,7 +514,7 @@ idataobject_getdatahere (LPDATAOBJECT This, LPFORMATETC pFormatEtc, LPSTGMEDIUM pMedium) { - GDK_NOTE (DND, g_print ("idataobject_getdatahere %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_getdatahere %p\n", This)); return E_UNEXPECTED; } @@ -525,7 +525,7 @@ idataobject_querygetdata (LPDATAOBJECT This, { int i; - GDK_NOTE (DND, g_print ("idataobject_querygetdata %#x %#x", This, pFormatEtc->cfFormat)); + GDK_NOTE (DND, g_print ("idataobject_querygetdata %p %#x", This, pFormatEtc->cfFormat)); for (i = 0; i < nformats; i++) if (pFormatEtc->cfFormat == formats[i].cfFormat) @@ -543,7 +543,7 @@ idataobject_getcanonicalformatetc (LPDATAOBJECT This, LPFORMATETC pFormatEtcIn, LPFORMATETC pFormatEtcOut) { - GDK_NOTE (DND, g_print ("idataobject_getcanonicalformatetc %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_getcanonicalformatetc %p\n", This)); return E_FAIL; } @@ -554,7 +554,7 @@ idataobject_setdata (LPDATAOBJECT This, LPSTGMEDIUM pMedium, BOOL fRelease) { - GDK_NOTE (DND, g_print ("idataobject_setdata %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_setdata %p\n", This)); return E_UNEXPECTED; } @@ -564,7 +564,7 @@ idataobject_enumformatetc (LPDATAOBJECT This, DWORD dwDirection, LPENUMFORMATETC *ppEnumFormatEtc) { - GDK_NOTE (DND, g_print ("idataobject_enumformatetc %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_enumformatetc %p\n", This)); if (dwDirection != DATADIR_GET) return E_NOTIMPL; @@ -580,7 +580,7 @@ idataobject_dadvise (LPDATAOBJECT This, LPADVISESINK pAdvSink, DWORD *pdwConnection) { - GDK_NOTE (DND, g_print ("idataobject_dadvise %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_dadvise %p\n", This)); return E_FAIL; } @@ -589,7 +589,7 @@ static HRESULT STDMETHODCALLTYPE idataobject_dunadvise (LPDATAOBJECT This, DWORD dwConnection) { - GDK_NOTE (DND, g_print ("idataobject_dunadvise %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_dunadvise %p\n", This)); return E_FAIL; } @@ -598,7 +598,7 @@ static HRESULT STDMETHODCALLTYPE idataobject_enumdadvise (LPDATAOBJECT This, LPENUMSTATDATA *ppenumAdvise) { - GDK_NOTE (DND, g_print ("idataobject_enumdadvise %#x\n", This)); + GDK_NOTE (DND, g_print ("idataobject_enumdadvise %p\n", This)); return E_FAIL; } @@ -609,7 +609,7 @@ ienumformatetc_addref (LPENUMFORMATETC This) enum_formats *en = (enum_formats *) This; int ref_count = ++en->ref_count; - GDK_NOTE (DND, g_print ("ienumformatetc_addref %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("ienumformatetc_addref %p %d\n", This, ref_count)); return ref_count; } @@ -619,7 +619,7 @@ ienumformatetc_queryinterface (LPENUMFORMATETC This, REFIID riid, LPVOID *ppvObject) { - GDK_NOTE (DND, g_print ("ienumformatetc_queryinterface %#x\n", This)); + GDK_NOTE (DND, g_print ("ienumformatetc_queryinterface %p\n", This)); *ppvObject = NULL; @@ -651,7 +651,7 @@ ienumformatetc_release (LPENUMFORMATETC This) enum_formats *en = (enum_formats *) This; int ref_count = --en->ref_count; - GDK_NOTE (DND, g_print ("ienumformatetc_release %#x %d\n", This, ref_count)); + GDK_NOTE (DND, g_print ("ienumformatetc_release %p %d\n", This, ref_count)); if (ref_count == 0) g_free (This); @@ -668,7 +668,7 @@ ienumformatetc_next (LPENUMFORMATETC This, enum_formats *en = (enum_formats *) This; int i, n; - GDK_NOTE (DND, g_print ("ienumformatetc_next %#x %d %d\n", This, en->ix, celt)); + GDK_NOTE (DND, g_print ("ienumformatetc_next %p %d %d\n", This, en->ix, celt)); n = 0; for (i = 0; i < celt; i++) @@ -694,7 +694,7 @@ ienumformatetc_skip (LPENUMFORMATETC This, { enum_formats *en = (enum_formats *) This; - GDK_NOTE (DND, g_print ("ienumformatetc_skip %#x %d %d\n", This, en->ix, celt)); + GDK_NOTE (DND, g_print ("ienumformatetc_skip %p %d %d\n", This, en->ix, celt)); en->ix += celt; return S_OK; @@ -705,7 +705,7 @@ ienumformatetc_reset (LPENUMFORMATETC This) { enum_formats *en = (enum_formats *) This; - GDK_NOTE (DND, g_print ("ienumformatetc_reset %#x\n", This)); + GDK_NOTE (DND, g_print ("ienumformatetc_reset %p\n", This)); en->ix = 0; @@ -719,7 +719,7 @@ ienumformatetc_clone (LPENUMFORMATETC This, enum_formats *en = (enum_formats *) This; enum_formats *new; - GDK_NOTE (DND, g_print ("ienumformatetc_clone %#x\n", This)); + GDK_NOTE (DND, g_print ("ienumformatetc_clone %p\n", This)); new = enum_formats_new (); @@ -773,7 +773,6 @@ static IEnumFORMATETCVtbl ief_vtbl = { ienumformatetc_clone }; -#endif /* OLE2_DND */ static target_drag_context * target_context_new (void) @@ -782,9 +781,7 @@ target_context_new (void) result = g_new0 (target_drag_context, 1); -#ifdef OLE2_DND result->idt.lpVtbl = &idt_vtbl; -#endif result->context = gdk_drag_context_new (); result->context->is_source = FALSE; @@ -801,9 +798,7 @@ source_context_new (void) result = g_new0 (source_drag_context, 1); -#ifdef OLE2_DND result->ids.lpVtbl = &ids_vtbl; -#endif result->context = gdk_drag_context_new (); result->context->is_source = TRUE; @@ -813,7 +808,6 @@ source_context_new (void) return result; } -#ifdef OLE2_DND static data_object * data_object_new (void) { @@ -824,7 +818,7 @@ data_object_new (void) result->ido.lpVtbl = &ido_vtbl; result->ref_count = 1; - GDK_NOTE (DND, g_print ("data_object_new: %#x\n", result)); + GDK_NOTE (DND, g_print ("data_object_new: %p\n", result)); return result; } @@ -841,7 +835,7 @@ enum_formats_new (void) result->ref_count = 1; result->ix = 0; - GDK_NOTE (DND, g_print ("enum_formats_new: %#x\n", result)); + GDK_NOTE (DND, g_print ("enum_formats_new: %p\n", result)); return result; } @@ -953,16 +947,16 @@ gdk_dropfiles_filter (GdkXEvent *xev, if (msg->message == WM_DROPFILES) { - GDK_NOTE (DND, g_print ("WM_DROPFILES: %#x\n", (guint) msg->hwnd)); + GDK_NOTE (DND, g_print ("WM_DROPFILES: %p\n", msg->hwnd)); context = gdk_drag_context_new (); private = GDK_DRAG_CONTEXT_PRIVATE_DATA (context); context->protocol = GDK_DRAG_PROTO_WIN32_DROPFILES; context->is_source = FALSE; context->source_window = _gdk_parent_root; - gdk_drawable_ref (context->source_window); + g_object_ref (context->source_window); context->dest_window = event->any.window; - gdk_drawable_ref (context->dest_window); + g_object_ref (context->dest_window); /* WM_DROPFILES drops are always file names */ context->targets = g_list_append (NULL, GUINT_TO_POINTER (_text_uri_list)); @@ -1108,9 +1102,9 @@ local_send_enter (GdkDragContext *context, new_context->is_source = FALSE; new_context->source_window = context->source_window; - gdk_window_ref (new_context->source_window); + g_object_ref (new_context->source_window); new_context->dest_window = context->dest_window; - gdk_window_ref (new_context->dest_window); + g_object_ref (new_context->dest_window); new_context->targets = g_list_copy (context->targets); @@ -1208,7 +1202,7 @@ gdk_drag_do_leave (GdkDragContext *context, break; } - gdk_drawable_unref (context->dest_window); + g_object_unref (context->dest_window); context->dest_window = NULL; } } @@ -1226,7 +1220,7 @@ gdk_drag_begin (GdkWindow *window, new_context = gdk_drag_context_new (); new_context->is_source = TRUE; new_context->source_window = window; - gdk_window_ref (window); + g_object_ref (window); tmp_list = g_list_last (targets); new_context->targets = NULL; @@ -1257,7 +1251,7 @@ gdk_drag_begin (GdkWindow *window, ctx = source_context_new (); ctx->context->protocol = GDK_DRAG_PROTO_OLE2; ctx->context->source_window = window; - gdk_drawable_ref (window); + g_object_ref (window); tmp_list = g_list_last (targets); ctx->context->targets = NULL; @@ -1317,6 +1311,43 @@ gdk_drag_get_protocol_for_display (GdkDisplay *display, return 0; } +typedef struct { + gint x; + gint y; + HWND ignore; + HWND result; +} find_window_enum_arg; + +static BOOL CALLBACK +find_window_enum_proc (HWND hwnd, + LPARAM lparam) +{ + RECT rect; + POINT tl, br; + find_window_enum_arg *a = (find_window_enum_arg *) lparam; + + if (hwnd == a->ignore) + return TRUE; + + if (!IsWindowVisible (hwnd)) + return TRUE; + + tl.x = tl.y = 0; + ClientToScreen (hwnd, &tl); + GetClientRect (hwnd, &rect); + br.x = rect.right; + br.y = rect.bottom; + ClientToScreen (hwnd, &br); + + if (a->x >= tl.x && a->y >= tl.y && a->x < br.x && a->y < br.y) + { + a->result = hwnd; + return FALSE; + } + else + return TRUE; +} + void gdk_drag_find_window_for_screen (GdkDragContext *context, GdkWindow *drag_window, @@ -1326,21 +1357,24 @@ gdk_drag_find_window_for_screen (GdkDragContext *context, GdkWindow **dest_window, GdkDragProtocol *protocol) { - HWND recipient; - POINT pt; + find_window_enum_arg a; - pt.x = x_root; - pt.y = y_root; - recipient = WindowFromPoint (pt); - if (recipient == NULL) + a.x = x_root; + a.y = y_root; + a.ignore = drag_window ? GDK_WINDOW_HWND (drag_window) : NULL; + a.result = NULL; + + EnumWindows (find_window_enum_proc, (LPARAM) &a); + + if (a.result == NULL) *dest_window = NULL; else { - *dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT(recipient)); + *dest_window = gdk_win32_handle_table_lookup (GPOINTER_TO_UINT (a.result)); if (*dest_window) { *dest_window = gdk_window_get_toplevel (*dest_window); - gdk_drawable_ref (*dest_window); + g_object_ref (*dest_window); } if (context->source_window) @@ -1349,9 +1383,13 @@ gdk_drag_find_window_for_screen (GdkDragContext *context, *protocol = GDK_DRAG_PROTO_WIN32_DROPFILES; } - GDK_NOTE (DND, g_print ("gdk_drag_find_window: %#x +%d+%d Protocol: %d\n", - (drag_window ? (guint) GDK_WINDOW_HWND (drag_window) : 0), - x_root, y_root, *protocol)); + GDK_NOTE (DND, + g_print ("gdk_drag_find_window: %p +%d+%d: %p: %p %d\n", + (drag_window ? GDK_WINDOW_HWND (drag_window) : NULL), + x_root, y_root, + a.result, + (*dest_window ? GDK_WINDOW_HWND (*dest_window) : NULL), + *protocol)); } gboolean @@ -1384,7 +1422,7 @@ gdk_drag_motion (GdkDragContext *context, if (dest_window) { context->dest_window = dest_window; - gdk_window_ref (context->dest_window); + g_object_ref (context->dest_window); context->protocol = protocol; switch (protocol) @@ -1507,6 +1545,8 @@ gdk_drag_status (GdkDragContext *context, private = GDK_DRAG_CONTEXT_PRIVATE_DATA (context); + context->action = action; + src_context = gdk_drag_context_find (TRUE, context->source_window, context->dest_window); @@ -1598,7 +1638,7 @@ gdk_destroy_filter (GdkXEvent *xev, { IDropTarget *idtp = (IDropTarget *) data; - GDK_NOTE (DND, g_print ("gdk_destroy_filter: WM_DESTROY: %#x\n", msg->hwnd)); + GDK_NOTE (DND, g_print ("gdk_destroy_filter: WM_DESTROY: %p\n", msg->hwnd)); #if 0 idtp->lpVtbl->Release (idtp); #endif @@ -1624,8 +1664,8 @@ gdk_window_register_dnd (GdkWindow *window) gdk_drawable_set_data (window, "gdk-dnd-registered", GINT_TO_POINTER(TRUE), NULL); - GDK_NOTE (DND, g_print ("gdk_window_register_dnd: %#x\n", - (guint) GDK_WINDOW_HWND (window))); + GDK_NOTE (DND, g_print ("gdk_window_register_dnd: %p\n", + 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 diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c index 75841f3169..819adf6fcc 100644 --- a/gdk/win32/gdkdrawable-win32.c +++ b/gdk/win32/gdkdrawable-win32.c @@ -604,7 +604,7 @@ generic_draw (GdkDrawable *drawable, GDI_CALL (DeleteObject, (fg_brush)); GDI_CALL (SelectObject, (stipple_hdc, old_stipple_hbm)); GDI_CALL (DeleteDC, (stipple_hdc)); - gdk_drawable_unref (stipple_bitmap); + g_object_unref (stipple_bitmap); } /* Tile pixmap now contains the pattern that we should paint in @@ -665,8 +665,8 @@ generic_draw (GdkDrawable *drawable, GDI_CALL (SelectObject, (temp2_hdc, old_temp2_hbm)); GDI_CALL (DeleteDC, (temp1_hdc)); GDI_CALL (DeleteDC, (temp2_hdc)); - gdk_drawable_unref (temp1_pixmap); - gdk_drawable_unref (temp2_pixmap); + g_object_unref (temp1_pixmap); + g_object_unref (temp2_pixmap); } /* Cleanup */ @@ -674,8 +674,8 @@ generic_draw (GdkDrawable *drawable, GDI_CALL (SelectObject, (tile_hdc, old_tile_hbm)); GDI_CALL (DeleteDC, (mask_hdc)); GDI_CALL (DeleteDC, (tile_hdc)); - gdk_drawable_unref (mask_pixmap); - gdk_drawable_unref (tile_pixmap); + g_object_unref (mask_pixmap); + g_object_unref (tile_pixmap); gdk_win32_hdc_release (drawable, gc, blitting_mask); } diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 5d2cc50f62..841835bc79 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -655,8 +655,8 @@ find_window_for_pointer_event (GdkWindow* reported_window, GDK_NOTE (EVENTS, g_print ("...found %p for (%ld, %ld)\n", hwnd, pt.x, pt.y)); - gdk_window_unref (reported_window); - gdk_window_ref (other_window); + g_object_unref (reported_window); + g_object_ref (other_window); return other_window; } @@ -1190,7 +1190,7 @@ synthesize_enter_or_leave_event (GdkWindow *window, event = gdk_event_new (type); event->crossing.window = window; event->crossing.send_event = FALSE; - gdk_window_ref (event->crossing.window); + g_object_ref (event->crossing.window); event->crossing.subwindow = NULL; event->crossing.time = _gdk_win32_get_next_tick (msg->time); event->crossing.x = x; @@ -1355,10 +1355,10 @@ synthesize_crossing_events (GdkWindow *window, } if (current_window) - gdk_window_unref (current_window); + g_object_unref (current_window); current_window = window; if (current_window) - gdk_window_ref (current_window); + g_object_ref (current_window); } #if 0 @@ -1412,7 +1412,7 @@ synthesize_expose_events (GdkWindow *window) { event = gdk_event_new (GDK_EXPOSE); event->expose.window = window; - gdk_window_ref (window); + g_object_ref (window); event->expose.area.x = r.left; event->expose.area.y = r.top; event->expose.area.width = r.right - r.left; @@ -1523,9 +1523,9 @@ propagate (GdkWindow **window, { GDK_NOTE (EVENTS, g_print ("...sending to grabber %p\n", GDK_WINDOW_HWND (grab_window))); - gdk_drawable_unref (*window); + g_object_unref (*window); *window = grab_window; - gdk_drawable_ref (*window); + g_object_ref (*window); return TRUE; } } @@ -1553,9 +1553,9 @@ propagate (GdkWindow **window, GDK_NOTE (EVENTS, g_print ("...sending to grabber %p\n", GDK_WINDOW_HWND (grab_window))); - gdk_drawable_unref (*window); + g_object_unref (*window); *window = grab_window; - gdk_drawable_ref (*window); + g_object_ref (*window); return TRUE; } } @@ -1572,9 +1572,9 @@ propagate (GdkWindow **window, } else { - gdk_drawable_unref (*window); + g_object_unref (*window); *window = GDK_WINDOW (GDK_WINDOW_OBJECT (*window)->parent); - gdk_drawable_ref (*window); + g_object_ref (*window); GDK_NOTE (EVENTS, g_print ("%s %p", (in_propagation ? "," : "...propagating to"), GDK_WINDOW_HWND (*window))); @@ -1969,7 +1969,7 @@ gdk_event_translate (GdkDisplay *display, * CreateWindowEx call. * Don't insert xid there a second time, if it's done here. */ - gdk_drawable_ref (window); + g_object_ref (window); gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window); # endif } @@ -1983,7 +1983,7 @@ gdk_event_translate (GdkDisplay *display, return FALSE; } - gdk_drawable_ref (window); + g_object_ref (window); if (!GDK_WINDOW_DESTROYED (window)) { @@ -2026,9 +2026,9 @@ gdk_event_translate (GdkDisplay *display, if (new_window != window) { - gdk_drawable_unref (window); + g_object_unref (window); ASSIGN_WINDOW (new_window); - gdk_drawable_ref (window); + g_object_ref (window); } if (GDK_WINDOW_OBJECT (window)->extension_events != 0 @@ -2513,7 +2513,7 @@ gdk_event_translate (GdkDisplay *display, GdkEvent *event2 = gdk_event_new (GDK_KEY_PRESS); build_keypress_event (event2, msg); event2->key.window = window; - gdk_drawable_ref (window); + g_object_ref (window); _gdk_event_queue_append (display, event2); GDK_NOTE (EVENTS, print_event (event2)); } @@ -2755,7 +2755,7 @@ gdk_event_translate (GdkDisplay *display, if (current_window) { - gdk_drawable_unref (current_window); + g_object_unref (current_window); current_window = NULL; } @@ -2783,9 +2783,9 @@ gdk_event_translate (GdkDisplay *display, if (new_window != window) { - gdk_drawable_unref (window); + g_object_unref (window); ASSIGN_WINDOW (new_window); - gdk_drawable_ref (window); + g_object_ref (window); } if (GDK_WINDOW_OBJECT (window)->extension_events != 0 @@ -3304,7 +3304,7 @@ gdk_event_translate (GdkDisplay *display, event->any.window = window; if (window != NULL && window == current_window) { - gdk_drawable_unref (current_window); + g_object_unref (current_window); current_window = NULL; } @@ -3359,11 +3359,11 @@ done: if (return_val) { if (event->any.window) - gdk_drawable_ref (event->any.window); + g_object_ref (event->any.window); if (((event->any.type == GDK_ENTER_NOTIFY) || (event->any.type == GDK_LEAVE_NOTIFY)) && (event->crossing.subwindow != NULL)) - gdk_drawable_ref (event->crossing.subwindow); + g_object_ref (event->crossing.subwindow); GDK_NOTE (EVENTS, print_event (event)); } @@ -3375,7 +3375,7 @@ done: } if (window) - gdk_drawable_unref (window); + g_object_unref (window); return return_val; } diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c index 57c5241e16..8192f73375 100644 --- a/gdk/win32/gdkgc-win32.c +++ b/gdk/win32/gdkgc-win32.c @@ -106,10 +106,10 @@ gdk_gc_win32_finalize (GObject *object) gdk_font_unref (win32_gc->font); if (win32_gc->values_mask & GDK_GC_TILE) - gdk_drawable_unref (win32_gc->tile); + g_object_unref (win32_gc->tile); if (win32_gc->values_mask & GDK_GC_STIPPLE) - gdk_drawable_unref (win32_gc->stipple); + g_object_unref (win32_gc->stipple); if (win32_gc->pen_dashes) g_free (win32_gc->pen_dashes); @@ -204,11 +204,11 @@ gdk_win32_gc_values_to_win32values (GdkGCValues *values, if (mask & GDK_GC_TILE) { if (win32_gc->tile != NULL) - gdk_drawable_unref (win32_gc->tile); + g_object_unref (win32_gc->tile); win32_gc->tile = values->tile; if (win32_gc->tile != NULL) { - gdk_drawable_ref (win32_gc->tile); + g_object_ref (win32_gc->tile); win32_gc->values_mask |= GDK_GC_TILE; GDK_NOTE (GC, (g_print ("%stile=%p", s, @@ -226,7 +226,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues *values, if (mask & GDK_GC_STIPPLE) { if (win32_gc->stipple != NULL) - gdk_drawable_unref (win32_gc->stipple); + g_object_unref (win32_gc->stipple); win32_gc->stipple = values->stipple; if (win32_gc->stipple != NULL) { @@ -265,7 +265,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues *values, } else #endif - gdk_drawable_ref (win32_gc->stipple); + g_object_ref (win32_gc->stipple); win32_gc->values_mask |= GDK_GC_STIPPLE; GDK_NOTE (GC, (g_print ("%sstipple=%p", s, @@ -695,10 +695,10 @@ gdk_gc_copy (GdkGC *dst_gc, gdk_font_unref (dst_win32_gc->font); if (dst_win32_gc->tile != NULL) - gdk_drawable_unref (dst_win32_gc->tile); + g_object_unref (dst_win32_gc->tile); if (dst_win32_gc->stipple != NULL) - gdk_drawable_unref (dst_win32_gc->stipple); + g_object_unref (dst_win32_gc->stipple); if (dst_win32_gc->pen_dashes) g_free (dst_win32_gc->pen_dashes); @@ -722,10 +722,10 @@ gdk_gc_copy (GdkGC *dst_gc, gdk_font_ref (dst_win32_gc->font); if (dst_win32_gc->tile != NULL) - gdk_drawable_ref (dst_win32_gc->tile); + g_object_ref (dst_win32_gc->tile); if (dst_win32_gc->stipple != NULL) - gdk_drawable_ref (dst_win32_gc->stipple); + g_object_ref (dst_win32_gc->stipple); if (dst_win32_gc->pen_dashes) dst_win32_gc->pen_dashes = g_memdup (src_win32_gc->pen_dashes, diff --git a/gdk/win32/gdkgeometry-win32.c b/gdk/win32/gdkgeometry-win32.c index 256a820aa9..698610751a 100644 --- a/gdk/win32/gdkgeometry-win32.c +++ b/gdk/win32/gdkgeometry-win32.c @@ -884,7 +884,7 @@ gdk_window_queue_append (GdkWindow *window, g_print ("%s\n", _gdk_win32_gdkregion_to_string (item->u.antiexpose.area))))); - gdk_drawable_ref (window); + g_object_ref (window); translate_queue = g_slist_append (translate_queue, item) ; } @@ -975,7 +975,7 @@ _gdk_window_process_expose (GdkWindow *window, GDK_NOTE (EVENTS, g_print ("...item %ld being removed\n", item->serial)); translate_queue = g_slist_remove_link (translate_queue, translate_queue); - gdk_drawable_unref (item->window); + g_object_unref (item->window); if (item->type == GDK_WINDOW_QUEUE_ANTIEXPOSE) gdk_region_destroy (item->u.antiexpose.area); diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c index b0a9da27b7..88d5a5f566 100644 --- a/gdk/win32/gdkinput-win32.c +++ b/gdk/win32/gdkinput-win32.c @@ -249,7 +249,7 @@ gdk_input_wintab_init (void) g_warning ("gdk_input_wintab_init: gdk_window_new failed"); return; } - gdk_drawable_ref (wintab_window); + g_object_ref (wintab_window); for (devix = 0; devix < ndevices; devix++) { @@ -719,7 +719,7 @@ _gdk_input_other_event (GdkEvent *event, if (window == NULL) window = _gdk_parent_root; - gdk_drawable_ref (window); + g_object_ref (window); display = gdk_drawable_get_display (window); GDK_NOTE (EVENTS_OR_INPUT, @@ -823,10 +823,10 @@ _gdk_input_other_event (GdkEvent *event, pt.x = x; pt.y = y; ClientToScreen (GDK_WINDOW_HWND (window), &pt); - gdk_drawable_unref (window); + g_object_unref (window); window = (GdkWindow *) obj->parent; obj = GDK_WINDOW_OBJECT (window); - gdk_drawable_ref (window); + g_object_ref (window); ScreenToClient (GDK_WINDOW_HWND (window), &pt); x = pt.x; y = pt.y; diff --git a/gdk/win32/gdkpixmap-win32.c b/gdk/win32/gdkpixmap-win32.c index 273e4bd8bb..a3af93d194 100644 --- a/gdk/win32/gdkpixmap-win32.c +++ b/gdk/win32/gdkpixmap-win32.c @@ -426,7 +426,7 @@ gdk_pixmap_create_from_data (GdkDrawable *drawable, (TRUE, GDK_DRAWABLE_IMPL_WIN32 (GDK_PIXMAP_OBJECT (result)->impl), gc, source, 0, 0, 0, 0, width, height); - gdk_drawable_unref (source); + g_object_unref (source); gdk_gc_unref (gc); GDK_NOTE (PIXMAP, g_print ("gdk_pixmap_create_from_data: %dx%dx%d=%p\n", diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index 45fd1f808e..4d55eb7a33 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -123,8 +123,8 @@ gdk_selection_owner_set_for_display (GdkDisplay *display, GDK_NOTE (DND, (sel_name = gdk_atom_name (selection), - g_print ("gdk_selection_owner_set: %#x %#x (%s)\n", - (owner ? (guint) GDK_WINDOW_HWND (owner) : 0), + g_print ("gdk_selection_owner_set: %p %#x (%s)\n", + (owner ? GDK_WINDOW_HWND (owner) : NULL), (guint) selection, sel_name), g_free (sel_name))); @@ -214,9 +214,9 @@ gdk_selection_owner_get_for_display (GdkDisplay *display, GDK_NOTE (DND, (sel_name = gdk_atom_name (selection), - g_print ("gdk_selection_owner_get: %#x (%s) = %#x\n", + g_print ("gdk_selection_owner_get: %#x (%s) = %p\n", (guint) selection, sel_name, - (window ? (guint) GDK_WINDOW_HWND (window) : 0)), + (window ? GDK_WINDOW_HWND (window) : NULL)), g_free (sel_name))); return window; @@ -260,8 +260,8 @@ gdk_selection_convert (GdkWindow *requestor, GDK_NOTE (DND, (sel_name = gdk_atom_name (selection), tgt_name = gdk_atom_name (target), - g_print ("gdk_selection_convert: %#x %#x (%s) %#x (%s)\n", - (guint) GDK_WINDOW_HWND (requestor), + g_print ("gdk_selection_convert: %p %#x (%s) %#x (%s)\n", + GDK_WINDOW_HWND (requestor), (guint) selection, sel_name, (guint) target, tgt_name), g_free (sel_name), @@ -465,8 +465,8 @@ gdk_selection_property_get (GdkWindow *requestor, if (GDK_WINDOW_DESTROYED (requestor)) return 0; - GDK_NOTE (DND, g_print ("gdk_selection_property_get: %#x\n", - (guint) GDK_WINDOW_HWND (requestor))); + GDK_NOTE (DND, g_print ("gdk_selection_property_get: %p\n", + GDK_WINDOW_HWND (requestor))); prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (requestor)); @@ -494,8 +494,8 @@ _gdk_selection_property_delete (GdkWindow *window) { GdkSelProp *prop; - GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %#x\n", - (guint) GDK_WINDOW_HWND (window))); + GDK_NOTE (DND, g_print ("_gdk_selection_property_delete: %p\n", + GDK_WINDOW_HWND (window))); prop = g_hash_table_lookup (sel_prop_table, GDK_WINDOW_HWND (window)); if (prop != NULL) diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index d9f7e725ff..3a66353fc9 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -633,7 +633,7 @@ gdk_window_new (GdkWindow *parent, } } - gdk_drawable_ref (window); + g_object_ref (window); gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window); #endif @@ -657,7 +657,7 @@ gdk_window_new (GdkWindow *parent, } #ifdef WITHOUT_WM_CREATE - gdk_drawable_ref (window); + g_object_ref (window); gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window); #endif @@ -718,7 +718,7 @@ gdk_window_foreign_new_for_display (GdkDisplay *display, _gdk_window_init_position (GDK_WINDOW (private)); - gdk_drawable_ref (window); + g_object_ref (window); gdk_win32_handle_table_insert (&GDK_WINDOW_HWND (window), window); return window; @@ -794,7 +794,7 @@ gdk_window_destroy_notify (GdkWindow *window) } gdk_win32_handle_table_remove (GDK_WINDOW_HWND (window)); - gdk_drawable_unref (window); + g_object_unref (window); } static void @@ -1597,7 +1597,7 @@ gdk_window_set_background (GdkWindow *window, private->bg_pixmap != GDK_PARENT_RELATIVE_BG && private->bg_pixmap != GDK_NO_BG) { - gdk_drawable_unref (private->bg_pixmap); + g_object_unref (private->bg_pixmap); private->bg_pixmap = NULL; } } @@ -1617,7 +1617,7 @@ gdk_window_set_back_pixmap (GdkWindow *window, if (private->bg_pixmap && private->bg_pixmap != GDK_PARENT_RELATIVE_BG && private->bg_pixmap != GDK_NO_BG) - gdk_drawable_unref (private->bg_pixmap); + g_object_unref (private->bg_pixmap); if (parent_relative) { @@ -1628,7 +1628,7 @@ gdk_window_set_back_pixmap (GdkWindow *window, { if (pixmap) { - gdk_drawable_ref (pixmap); + g_object_ref (pixmap); private->bg_pixmap = pixmap; } else