win32: gdk3 resurrection
There are sure regressions but basic stuff seems to be working again after all the API breakage done with comments like "Win32 and Quartz need to be ported still."
This commit is contained in:
		| @ -33,6 +33,7 @@ | ||||
| #include "gdkselection.h" | ||||
| #include "gdkdisplay.h" | ||||
| #include "gdkprivate-win32.h" | ||||
| #include "gdkwin32.h" | ||||
|  | ||||
| /* We emulate the GDK_SELECTION window properties of windows (as used | ||||
|  * in the X11 backend) by using a hash table from window handles to | ||||
| @ -253,11 +254,11 @@ get_mapped_gdk_atom_name (GdkAtom gdk_target) | ||||
| } | ||||
|  | ||||
| gboolean | ||||
| gdk_selection_owner_set_for_display (GdkDisplay *display, | ||||
|                                      GdkWindow  *owner, | ||||
|                                      GdkAtom     selection, | ||||
|                                      guint32     time, | ||||
|                                      gboolean    send_event) | ||||
| _gdk_win32_display_set_selection_owner (GdkDisplay *display, | ||||
| 					GdkWindow  *owner, | ||||
| 					GdkAtom     selection, | ||||
| 					guint32     time, | ||||
| 					gboolean    send_event) | ||||
| { | ||||
|   HWND hwnd; | ||||
|   GdkEvent tmp_event; | ||||
| @ -333,8 +334,8 @@ gdk_selection_owner_set_for_display (GdkDisplay *display, | ||||
| } | ||||
|  | ||||
| GdkWindow* | ||||
| gdk_selection_owner_get_for_display (GdkDisplay *display, | ||||
|                                      GdkAtom     selection) | ||||
| _gdk_win32_display_get_selection_owner (GdkDisplay *display, | ||||
|                                         GdkAtom     selection) | ||||
| { | ||||
|   GdkWindow *window; | ||||
|  | ||||
| @ -351,7 +352,8 @@ gdk_selection_owner_get_for_display (GdkDisplay *display, | ||||
|       return gdk_win32_handle_table_lookup ((GdkNativeWindow) owner); | ||||
|     } | ||||
|  | ||||
|   window = gdk_window_lookup ((GdkNativeWindow) g_hash_table_lookup (sel_owner_table, selection)); | ||||
|   window = gdk_win32_window_lookup_for_display (display, | ||||
|                                                 (GdkNativeWindow) g_hash_table_lookup (sel_owner_table, selection)); | ||||
|  | ||||
|   GDK_NOTE (DND, { | ||||
|       gchar *sel_name = gdk_atom_name (selection); | ||||
| @ -387,10 +389,11 @@ generate_selection_notify (GdkWindow *requestor, | ||||
| } | ||||
|  | ||||
| void | ||||
| gdk_selection_convert (GdkWindow *requestor, | ||||
| 		       GdkAtom    selection, | ||||
| 		       GdkAtom    target, | ||||
| 		       guint32    time) | ||||
| _gdk_win32_display_convert_selection (GdkDisplay *display, | ||||
| 				      GdkWindow *requestor, | ||||
| 				      GdkAtom    selection, | ||||
| 				      GdkAtom    target, | ||||
| 				      guint32    time) | ||||
| { | ||||
|   HGLOBAL hdata; | ||||
|   GdkAtom property = _gdk_selection; | ||||
| @ -804,10 +807,11 @@ gdk_selection_convert (GdkWindow *requestor, | ||||
| } | ||||
|  | ||||
| gint | ||||
| gdk_selection_property_get (GdkWindow  *requestor, | ||||
| 			    guchar    **data, | ||||
| 			    GdkAtom    *ret_type, | ||||
| 			    gint       *ret_format) | ||||
| _gdk_win32_display_get_selection_property (GdkDisplay *display, | ||||
| 					   GdkWindow  *requestor, | ||||
| 					   guchar    **data, | ||||
| 					   GdkAtom    *ret_type, | ||||
| 					   gint       *ret_format) | ||||
| { | ||||
|   GdkSelProp *prop; | ||||
|  | ||||
| @ -869,12 +873,12 @@ _gdk_selection_property_delete (GdkWindow *window) | ||||
| } | ||||
|  | ||||
| void | ||||
| gdk_selection_send_notify_for_display (GdkDisplay      *display, | ||||
|                                        GdkNativeWindow  requestor, | ||||
|                                        GdkAtom     	selection, | ||||
|                                        GdkAtom     	target, | ||||
|                                        GdkAtom     	property, | ||||
|                                        guint32     	time) | ||||
| _gdk_win32_display_send_selection_notify (GdkDisplay      *display, | ||||
| 					  GdkNativeWindow  requestor, | ||||
| 					  GdkAtom     	selection, | ||||
| 					  GdkAtom     	target, | ||||
| 					  GdkAtom     	property, | ||||
| 					  guint32     	time) | ||||
| { | ||||
|   g_return_if_fail (display == _gdk_display); | ||||
|  | ||||
| @ -1020,13 +1024,13 @@ make_list (const gchar  *text, | ||||
|   return n_strings; | ||||
| } | ||||
|  | ||||
| gint  | ||||
| gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display, | ||||
|                                             GdkAtom        encoding, | ||||
|                                             gint           format, | ||||
|                                             const guchar  *text, | ||||
|                                             gint           length, | ||||
|                                             gchar       ***list) | ||||
| gint | ||||
| _gdk_win32_display_text_property_to_utf8_list (GdkDisplay    *display, | ||||
| 					       GdkAtom        encoding, | ||||
| 					       gint           format, | ||||
| 					       const guchar  *text, | ||||
| 					       gint           length, | ||||
| 					       gchar       ***list) | ||||
| { | ||||
|   g_return_val_if_fail (text != NULL, 0); | ||||
|   g_return_val_if_fail (length >= 0, 0); | ||||
| @ -1086,7 +1090,8 @@ gdk_string_to_compound_text_for_display (GdkDisplay  *display, | ||||
| } | ||||
|  | ||||
| gchar * | ||||
| gdk_utf8_to_string_target (const gchar *str) | ||||
| _gdk_win32_display_utf8_to_string_target (GdkDisplay *display, | ||||
| 					  const gchar *str) | ||||
| { | ||||
|   return _gdk_utf8_to_string_target_internal (str, strlen (str)); | ||||
| } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Hans Breuer
					Hans Breuer