Reflect recent renamings and removals of functions.

2002-11-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/gdk.def: Reflect recent renamings and removals of functions.

	Merge from stable:

	Start implementing all fill styles (i.e. tiled, stippled, and
	opaque stippled in addition to the plain solid style) in the Win32
	backend in an elegant and generic way. For now only did the
	draw_rectangle() and draw_glyphs() methods. The rest will
	follow. Previously some of the drawing methods implemented opaque
	stippling, but not tiles or non-opaque stippling.

	Seems to work fine, now the check marks show up in check buttons,
	the stippled background and stippled text in gtk-demo's Text
	Widget look as they should, and GtkText's line wrap arrow shows
	correctly instead of an ugly rectangle. [This refers to the stable
	branch, haven't actually checked HEAD.]

	The implementation does do a lot of pixmap handling and blitting
	back and forth, especially on Win9x. But performance is hopefully
	not an issue. I don't think many applications do a lot of tiled or
	stippled drawing.

	* gdk/win32/gdkprivate-win32.h: Define a new macro, GDI_CALL, that
	calls a GDI function and prints a warning if it failed. Also
	API_CALL for non-GDI calls. Cleans all the the if (!BlaBla())
	WIN32_GDI_FAILED ("BlaBla") snippets, these can now be written
	GDI_CALL (BlaBla, ()). Declare new functions.

	* gdk/win32/gdkdrawable-win32.c: Use GDI_CALL macro in lots of places.

	(generic_draw): New function that handles all the blitting
	necessary to implement tiles and stipples. A function that
	actually draws stuff is passed as a parameter to
	generic_draw(). If the fill style is solid, it is called
	directly, to draw on the destination drawable. Otherwise it is
	called to draw on a temporary mask bitmap, which then is used in
	blitting operations. The tiles and/or stipples are rendered into
	another temporary pixmap. If MaskBlt() is available (on NT/2k/XP),
	it is used, otherwise a sequence of BitBlt() is used to do the
	final composition onto the destination drawable.

	(draw_tiles_lowlevel, draw_tiles): Some renaming and code
	reorg. Use BitBlt() to blit each tile, not gdk_draw_drawable().

	(rop2_to_rop3): New function, does binary->ternary rop mapping.

	(blit_from_pixmap, blit_inside_window, blit_from_window): Use
	rop2_to_rop3(). Previously used SRCCOPY always...

	(draw_rectangle, gdk_win32_draw_rectangle, draw_glyphs,
	gdk_win32_draw_glyphs): Split functionality into two functions,
	with generic_draw() doing its magic inbetween.

	* gdk/win32/gdkevents-win32.c: Remove the TrackMouseEvent code, it
	was ifdeffed out and wouldn't have done anything even if
	enabled. Remove the GDK_EVENT_FUNC_FROM_WINDOW_PROC code, didn't
	have any effect any more anyway after all the changes GTK+ has
	gone through in the last years. Remove some #if 0 code.

	* gdk/win32/gdkgc-win32.c (gdk_gc_copy): Set the copy's hdc field
	to NULL in case a GC is copied while it has a Windows DC active.

	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkglobals-win32.c: Remove gdk_event_func_from_window_proc.

	* gdk/win32/gdkmain-win32.c: Remove -event-func-from-window-proc
	option. If there is a PRETEND_WIN9X envvar, set windows_version as
	if on Win9x.

	* gdk/win32/gdkpixmap-win32.c (_gdk_win32_pixmap_new,
	gdk_pixmap_new): Combine these two, _gdk_win32_pixmap_new() wasn't
	used or exported. Make a bit more like the X11 version. Hopefully
	I didn't break the fragile palettized display ("pseudocolor")
	code.

	* gdk/win32/gdkgc-win32.c: Various debugging output improvements.

	(predraw_set_foreground): Check whether
	tile/stipple origins are valid when calling SetBrushOrgEx().

	(gdk_win32_hdc_get): Ifdef out code that tries to handle the
	stipple by converting it into a region, and combining the clip
	region with that. A stipple shouldn't work like that, it should
	replicate in x and y directions. Stipples are now handled by
	generic_draw() in gdkdrawable-win32.c.

	* gdk/win32/gdkmain-win32.c: (gdk_win32_gcvalues_mask_to_string,
	gdk_win32_rop2_to_string): New debugging functions.

	(gdk_win32_print_dc): Print also DC's rop2 and text color.

1 files changed, 5 insertions, 7 deletions

diff --git a/gdk/gdk.def b/gdk/gdk.def
index 04e402f6d..1f74b8c03 100644
--- a/gdk/gdk.def
+++ b/gdk/gdk.def
@@ -38,10 +38,10 @@ EXPORTS
 	gdk_colors_free
 	gdk_colors_store
 	gdk_crossing_mode_get_type
-	gdk_cursor_get_screen
+	gdk_cursor_get_display
 	gdk_cursor_get_type
 	gdk_cursor_new
-	gdk_cursor_new_for_screen
+	gdk_cursor_new_for_display
 	gdk_cursor_new_from_pixmap
 	gdk_cursor_ref
 	gdk_cursor_type_get_type
@@ -58,12 +58,14 @@ EXPORTS
 	gdk_device_set_source
 	gdk_devices_list
 	gdk_display_beep
+	gdk_display_get_default
 	gdk_display_get_default_screen
 	gdk_display_get_n_screens
 	gdk_display_get_screen
 	gdk_display_get_type
 	gdk_display_get_window_at_pointer
 	gdk_display_keyboard_ungrab
+	gdk_display_open
 	gdk_display_pointer_is_grabbed
 	gdk_display_pointer_ungrab
 	gdk_display_sync
@@ -194,10 +196,7 @@ EXPORTS
 	gdk_gc_set_values
 	gdk_gc_unref
 	gdk_gc_values_mask_get_type
-	gdk_get_default_display
 	gdk_get_default_root_window
-	gdk_get_default_screen
-;	gdk_get_display
 	gdk_get_display_arg_name
 	gdk_get_program_class
 	gdk_get_show_events
@@ -225,7 +224,6 @@ EXPORTS
 	gdk_input_remove
 	gdk_input_set_extension_events
 	gdk_input_source_get_type
-	gdk_input_window_destroy
 	gdk_join_style_get_type
 	gdk_keyboard_grab
 	gdk_keyboard_grab_info_libgtk_only
@@ -251,7 +249,6 @@ EXPORTS
 	gdk_mbstowcs
 	gdk_modifier_type_get_type
 	gdk_notify_type_get_type
-	gdk_open_display
 	gdk_overlap_type_get_type
 	gdk_pango_attr_embossed_new
 	gdk_pango_attr_stipple_new
@@ -323,6 +320,7 @@ EXPORTS
 	gdk_rgb_set_min_colors
 	gdk_rgb_set_verbose
 	gdk_rgb_xpixel_from_rgb
+	gdk_screen_get_default
 	gdk_screen_get_default_colormap
 	gdk_screen_get_display
 	gdk_screen_get_height