Commit 20e675e1 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Generate gtk/makefile.mingw.

2000-07-25  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Generate gtk/makefile.mingw.

	* config.h.win32: Add GETTEXT_PACKAGE.

	* gdk/gdk.def
	* gtk/gtk.def: Updates.

	* gdk/gdkfont.h
	* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
	need them any longer.

	* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.

	* gdk/win32/*.c: More work.

	* gdk/win32/gdkpango-win32.c: New file.

	* gtk/makefile.mingw.in: New file

	* gtk/makefile.cygwin: Removed

	* gtk/Makefile.am: Update accordingly.

	* gtk/gtkmain.c: Use gtk_win32_get_installation_directory().

	* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
	is enough.

	* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
parent 5ac61d3e
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -2,13 +2,21 @@
* Makefile.am: Include the build directory.
* configure.in: Generate build/Makefile and build/win32/Makefile.
* configure.in: Generate build/Makefile, build/win32/Makefile
and gtk/makefile.mingw.
* config.h.win32: Add USE_GMODULE and USE_MMX for gdk-pixbuf.
Add GETTEXT_PACKAGE.
* gdk/gdk.def
* gtk/gtk.def: Updates.
* gdk/gdkfont.h
* gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't
need them any longer.
* gdk/gdkinput.h: Mark gdk_core_pointer for export/import.
* gdk/makefile.mingw.in: Define GDK_COMPILATION. Link with
PANGOWIN32_LIBS and gdk_pixbuf.
......@@ -22,9 +30,24 @@
* gdk/win32/gdkinputprivate.h: Remove.
* gdk/win32/gdkpango-win32.c: New file.
* gtk/makefile.mingw.in: New file
* gtk/makefile.cygwin: Removed
* gtk/Makefile.am: Update accordingly.
* gtk/gtkrc.[ch] (gtk_win32_get_installation_directory): Renamed and
made externally visible.
* gtk/gtkmain.c: Use it.
* gtk/gtktextdisplay.c: No need to include pangox.h, pango.h
is enough.
* gtk/gtktypeutils.c: Mark glib_debug_objects for import.
2000-07-24 Elliot Lee <sopwith@redhat.com>
* gdk/gdkprivate.h: Remove gdk_*_lookup() defines, since they are defined by the
individual backends already.
......
......@@ -195,3 +195,5 @@
#define USE_MMX 1
/* #undef HAVE_SIGSETJMP */
#define GETTEXT_PACKAGE "gtk20"
......@@ -42,6 +42,7 @@ EXPORTS
gdk_colors_alloc
gdk_colors_free
gdk_colors_store
gdk_core_pointer
gdk_cursor_new
gdk_cursor_new_from_pixmap
gdk_cursor_ref
......@@ -54,6 +55,7 @@ EXPORTS
gdk_dnd_init
gdk_drag_abort
gdk_drag_begin
gdk_drag_context_get_type
gdk_drag_context_new
gdk_drag_context_ref
gdk_drag_context_unref
......@@ -65,9 +67,12 @@ EXPORTS
gdk_drag_status
gdk_draw_arc
gdk_draw_drawable
gdk_draw_glyphs
gdk_draw_gray_image
gdk_draw_image
gdk_draw_indexed_image
gdk_draw_layout
gdk_draw_layout_line
gdk_draw_line
gdk_draw_lines
gdk_draw_point
......@@ -86,6 +91,7 @@ EXPORTS
gdk_drawable_get_size
gdk_drawable_get_type
gdk_drawable_get_visual
gdk_drawable_impl_win32_get_type
gdk_drawable_ref
gdk_drawable_set_colormap
gdk_drawable_set_data
......@@ -118,11 +124,10 @@ EXPORTS
gdk_exit
gdk_flush
gdk_font_equal
gdk_font_from_description
gdk_font_full_name_free
gdk_font_full_name_get
gdk_font_id
gdk_font_list_free
gdk_font_list_new
gdk_font_load
gdk_font_ref
gdk_font_unref
......@@ -135,6 +140,7 @@ EXPORTS
gdk_gc_new_with_values
gdk_gc_ref
gdk_gc_set_background
gdk_gc_set_colormap
gdk_gc_set_clip_mask
gdk_gc_set_clip_origin
gdk_gc_set_clip_rectangle
......@@ -187,15 +193,19 @@ EXPORTS
gdk_key_repeat_restore
gdk_keyboard_grab
gdk_keyboard_ungrab
gdk_keyval_convert_case
gdk_keyval_from_name
gdk_keyval_is_lower
gdk_keyval_is_upper
gdk_keyval_name
gdk_keyval_to_lower
gdk_keyval_to_unicode
gdk_keyval_to_upper
gdk_list_visuals
gdk_mbstowcs
gdk_null_window_warnings
gdk_pango_context_get
gdk_pango_context_set_colormap
gdk_parent_root
gdk_pixmap_colormap_create_from_xpm
gdk_pixmap_colormap_create_from_xpm_d
......@@ -203,6 +213,7 @@ EXPORTS
gdk_pixmap_create_from_xpm
gdk_pixmap_create_from_xpm_d
gdk_pixmap_foreign_new
gdk_pixmap_get_type
gdk_pixmap_new
gdk_pointer_grab
gdk_pointer_is_grabbed
......@@ -225,6 +236,7 @@ EXPORTS
gdk_region_point_in
gdk_region_polygon
gdk_region_rect_in
gdk_region_rectangle
gdk_region_shrink
gdk_region_subtract
gdk_region_union
......@@ -272,6 +284,7 @@ EXPORTS
gdk_threads_enter
gdk_threads_leave
gdk_threads_mutex
gdk_unicode_to_keyval
gdk_visual_get_best
gdk_visual_get_best_depth
gdk_visual_get_best_type
......@@ -308,6 +321,7 @@ EXPORTS
gdk_window_get_user_data
gdk_window_hide
gdk_window_invalidate_rect
gdk_window_invalidate_region
gdk_window_is_viewable
gdk_window_is_visible
gdk_window_lower
......@@ -315,6 +329,8 @@ EXPORTS
gdk_window_move
gdk_window_move_resize
gdk_window_new
gdk_window_object_get_type
gdk_window_peek_children
gdk_window_process_all_updates
gdk_window_process_updates
gdk_window_raise
......@@ -322,6 +338,7 @@ EXPORTS
gdk_window_remove_filter
gdk_window_reparent
gdk_window_resize
gdk_window_scroll
gdk_window_set_back_pixmap
gdk_window_set_background
gdk_window_set_child_shapes
......
......@@ -25,13 +25,6 @@ struct _GdkFont
gint descent;
};
#ifdef GDK_WINDOWING_WIN32
/* Temporary functions, will be replaced by something else for all backends
* eventually. Don't use!
*/
gchar** gdk_font_list_new (const gchar *font_pattern, gint *n_returned);
void gdk_font_list_free (gchar **font_list);
#endif
GdkFont* gdk_font_load (const gchar *font_name);
GdkFont* gdk_fontset_load (const gchar *fontset_name);
......
......@@ -125,7 +125,7 @@ void gdk_input_set_extension_events (GdkWindow *window,
gint mask,
GdkExtensionMode mode);
extern GdkDevice *gdk_core_pointer;
GDKVAR GdkDevice *gdk_core_pointer;
#ifdef __cplusplus
}
......
......@@ -42,15 +42,6 @@ GdkPixmap* gdk_pixmap_new (GdkWindow *window,
gint width,
gint height,
gint depth);
#ifdef GDK_WINDOWING_WIN32
GdkPixmap* gdk_pixmap_create_on_shared_image
(GdkImage **image_return,
GdkWindow *window,
GdkVisual *visual,
gint width,
gint height,
gint depth);
#endif
GdkBitmap* gdk_bitmap_create_from_data (GdkWindow *window,
const gchar *data,
gint width,
......
......@@ -37,7 +37,6 @@
#include "gdkproperty.h"
#include "gdkinternals.h"
#include "gdkprivate-win32.h"
#include "gdkdrawable-win32.h"
#ifdef OLE2_DND
#include <ole2.h>
......@@ -50,7 +49,7 @@
#include <gdk/gdk.h>
typedef struct _GdkDragContextPrivate GdkDragContextPrivate;
typedef struct _GdkDragContextPrivateWin32 GdkDragContextPrivateWin32;
typedef enum {
GDK_DRAG_STATUS_DRAG,
......@@ -89,10 +88,8 @@ static int nformats;
/* Structure that holds information about a drag in progress.
* this is used on both source and destination sides.
*/
struct _GdkDragContextPrivate {
GdkDragContext context;
guint ref_count;
struct _GdkDragContextPrivateWin32 {
gint ref_count;
guint16 last_x; /* Coordinates from last event */
guint16 last_y;
......@@ -100,65 +97,111 @@ struct _GdkDragContextPrivate {
guint drag_status; /* Current status of drag */
};
#define PRIVATE_DATA(context) ((GdkDragContextPrivateWin32 *) GDK_DRAG_CONTEXT (context)->windowing_data)
GdkDragContext *current_dest_drag = NULL;
/* Drag Contexts */
static void gdk_drag_context_init (GdkDragContext *dragcontext);
static void gdk_drag_context_class_init (GdkDragContextClass *klass);
static void gdk_drag_context_finalize (GObject *object);
static gpointer parent_class = NULL;
static GList *contexts;
GdkDragContext *
gdk_drag_context_new (void)
GType
gdk_drag_context_get_type (void)
{
GdkDragContextPrivate *result;
static GType object_type = 0;
result = g_new0 (GdkDragContextPrivate, 1);
if (!object_type)
{
static const GTypeInfo object_info =
{
sizeof (GdkDragContextClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) gdk_drag_context_class_init,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (GdkDragContext),
0, /* n_preallocs */
(GInstanceInitFunc) gdk_drag_context_init,
};
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkDragContext",
&object_info);
}
return object_type;
}
result->ref_count = 1;
static void
gdk_drag_context_init (GdkDragContext *dragcontext)
{
GdkDragContextPrivateWin32 *private = g_new0 (GdkDragContextPrivateWin32, 1);
contexts = g_list_prepend (contexts, result);
dragcontext->windowing_data = private;
private->ref_count = 1;
return (GdkDragContext *) result;
contexts = g_list_prepend (contexts, dragcontext);
}
void
gdk_drag_context_ref (GdkDragContext *context)
static void
gdk_drag_context_class_init (GdkDragContextClass *klass)
{
g_return_if_fail (context != NULL);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
((GdkDragContextPrivate *)context)->ref_count++;
object_class->finalize = gdk_drag_context_finalize;
}
void
gdk_drag_context_unref (GdkDragContext *context)
static void
gdk_drag_context_finalize (GObject *object)
{
GdkDragContextPrivate *private = (GdkDragContextPrivate *)context;
GdkDragContext *context = GDK_DRAG_CONTEXT (object);
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (context);
g_return_if_fail (context != NULL);
g_list_free (context->targets);
if (private->ref_count <= 0)
abort ();
if (context->source_window)
{
gdk_window_unref (context->source_window);
}
if (context->dest_window)
gdk_window_unref (context->dest_window);
contexts = g_list_remove (contexts, context);
private->ref_count--;
g_free (private);
G_OBJECT_CLASS (parent_class)->finalize (object);
}
GDK_NOTE (DND, g_print ("gdk_drag_context_unref: %d%s\n",
private->ref_count,
(private->ref_count == 0 ? " freeing" : "")));
/* Drag Contexts */
if (private->ref_count == 0)
{
g_dataset_destroy (private);
g_list_free (context->targets);
GdkDragContext *
gdk_drag_context_new (void)
{
return g_object_new (gdk_drag_context_get_type (), NULL);
}
if (context->source_window)
gdk_drawable_unref (context->source_window);
void
gdk_drag_context_ref (GdkDragContext *context)
{
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
if (context->dest_window)
gdk_drawable_unref (context->dest_window);
g_object_ref (G_OBJECT (context));
}
contexts = g_list_remove (contexts, private);
g_free (private);
}
void
gdk_drag_context_unref (GdkDragContext *context)
{
g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
g_object_unref (G_OBJECT (context));
}
#if 0
......@@ -223,13 +266,13 @@ static ULONG STDMETHODCALLTYPE
idroptarget_addref (LPDROPTARGET This)
{
target_drag_context *ctx = (target_drag_context *) This;
GdkDragContextPrivate *private = (GdkDragContextPrivate *) ctx->context;
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (ctx->context);
int ref_count = ++private->ref_count;
gdk_drag_context_ref (ctx->context);
GDK_NOTE (DND, g_print ("idroptarget_addref %#x %d\n",
This, private->ref_count));
GDK_NOTE (DND, g_print ("idroptarget_addref %#x %d\n", This, ref_count));
return private->ref_count;
return ref_count;
}
static HRESULT STDMETHODCALLTYPE
......@@ -268,12 +311,11 @@ static ULONG STDMETHODCALLTYPE
idroptarget_release (LPDROPTARGET This)
{
target_drag_context *ctx = (target_drag_context *) This;
GdkDragContextPrivate *private = (GdkDragContextPrivate *) ctx->context;
int ref_count = private->ref_count - 1;
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (ctx->context);
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 %#x %d\n", This, ref_count));
if (ref_count == 0)
g_free (This);
......@@ -328,7 +370,7 @@ static ULONG STDMETHODCALLTYPE
idropsource_addref (LPDROPSOURCE This)
{
source_drag_context *ctx = (source_drag_context *) This;
GdkDragContextPrivate *private = (GdkDragContextPrivate *) ctx->context;
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (ctx->context);
gdk_drag_context_ref (ctx->context);
GDK_NOTE (DND, g_print ("idropsource_addref %#x %d\n",
......@@ -372,12 +414,11 @@ static ULONG STDMETHODCALLTYPE
idropsource_release (LPDROPSOURCE This)
{
source_drag_context *ctx = (source_drag_context *) This;
GdkDragContextPrivate *private = (GdkDragContextPrivate *) ctx->context;
int ref_count = private->ref_count - 1;
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (ctx->context);
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 %#x %d\n", This, ref_count));
if (ref_count == 0)
g_free (This);
......@@ -904,7 +945,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
gpointer data)
{
GdkDragContext *context;
GdkDragContextPrivate *private;
GdkDragContextPrivateWin32 *private;
static GdkAtom text_uri_list_atom = GDK_NONE;
GString *result;
MSG *msg = (MSG *) xev;
......@@ -921,7 +962,7 @@ gdk_dropfiles_filter (GdkXEvent *xev,
GDK_NOTE (DND, g_print ("WM_DROPFILES: %#x\n", msg->hwnd));
context = gdk_drag_context_new ();
private = (GdkDragContextPrivate *) context;
private = PRIVATE_DATA (context);
context->protocol = GDK_DRAG_PROTO_WIN32_DROPFILES;
context->is_source = FALSE;
context->source_window = gdk_parent_root;
......@@ -1108,7 +1149,7 @@ gdk_drag_find_window (GdkDragContext *context,
GdkWindow **dest_window,
GdkDragProtocol *protocol)
{
GdkDragContextPrivate *private = (GdkDragContextPrivate *)context;
GdkDragContextPrivateWin32 *private = PRIVATE_DATA (context);
HWND recipient;
POINT pt;
......