gdk/win32/gdkprivate-win32.h gdk/win32/gdkglobals-win32.c Add more

2005-11-01  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkglobals-win32.c
	* gdk/win32/gdkmain-win32.c (_gdk_windowing_init): Add more
	pre-interned GdkAtoms and pre-registered clipboard formats. Sort
	their declarations, definitions and assignments into a more
	logical and consistent order.

	* gdk/win32/gdkmain-win32.c (_gdk_win32_cf_to_string): Include the
	CF_ prefix for the predefined clipboard format names. Put quotes
	around registered format names to distinguish them.

	* gdk/win32/gdkproperty-win32.c (gdk_property_change): Return
	immediately with a warning if the property type is STRING, TEXT,
	COMPOUND_TEXT or SAVE_TARGETS, as these are X11-specific that we
	should never pretend to handle on Win32. Handle only UTF8_STRING
	here, other formats with delayed rendering. Use \uc1 instead of
	\uc0 when generating Rich Text Format for easier testability on
	XP, where WordPad misinterprets \uc0 encoded characters. Add more
	GDK_NOTE debugging output for Clipboard operations.

	* gdk/win32/gdkselection-win32.c: Debugging printout improvements.
	(gdk_selection_convert): Don't pretent to handle STRING, just
	UTF8_STRING. Streamline error handling, don't unnecessarily have a
	GError which then isn't used for anything anyway if it gets set.
	(gdk_win32_selection_add_targets): Skip also STRING, TEXT,
	COMPOUND_TEXT and SAVE_TARGETS in addition to UTF8_STRING.

1 files changed, 7 insertions, 6 deletions

diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index a178ccbf25..dce7cba73f 100644
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -48,10 +48,15 @@ UINT		  _gdk_input_codepage;
 
 WORD  		  _cf_rtf;
 WORD		  _cf_utf8_string;
+WORD		  _cf_image_bmp;
 
-GdkAtom           _utf8_string;
+GdkAtom           _gdk_selection_property;
+GdkAtom	          _wm_transient_for;
 GdkAtom		  _targets;
-
+GdkAtom		  _save_targets;
+GdkAtom           _utf8_string;
+GdkAtom		  _text;
+GdkAtom		  _compound_text;
 GdkAtom		  _text_uri_list;
 GdkAtom		  _image_bmp;
 
@@ -59,10 +64,6 @@ GdkAtom		  _local_dnd;
 GdkAtom		  _gdk_win32_dropfiles;
 GdkAtom		  _gdk_ole2_dnd;
 
-GdkAtom           _gdk_selection_property;
-
-GdkAtom	          _wm_transient_for;
-
 gint		  _gdk_input_ignore_wintab = FALSE;
 gint		  _gdk_max_colors = 0;