AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

win32: Get rid of GdkAtom

Browse Source
This commit is contained in:
Benjamin Otte 2020-02-23 01:43:42 +01:00
parent 60307da5b1
commit f536cf0a43
4 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/win32/gdkclipdrop-win32.c
View File

@ -1539,7 +1539,7 @@ gdk_win32_clipdrop_init (GdkWin32Clipdrop *win32_clipdrop)
win32_clipdrop->GetUpdatedClipboardFormats = GetProcAddress (user32, "GetUpdatedClipboardFormats"); win32_clipdrop->GetUpdatedClipboardFormats = GetProcAddress (user32, "GetUpdatedClipboardFormats");
FreeLibrary (user32); FreeLibrary (user32);
atoms = g_array_sized_new (FALSE, TRUE, sizeof (GdkAtom), GDK_WIN32_ATOM_INDEX_LAST); atoms = g_array_sized_new (FALSE, TRUE, sizeof (const char *), GDK_WIN32_ATOM_INDEX_LAST);
g_array_set_size (atoms, GDK_WIN32_ATOM_INDEX_LAST); g_array_set_size (atoms, GDK_WIN32_ATOM_INDEX_LAST);
cfs = g_array_sized_new (FALSE, TRUE, sizeof (UINT), GDK_WIN32_CF_INDEX_LAST); cfs = g_array_sized_new (FALSE, TRUE, sizeof (UINT), GDK_WIN32_CF_INDEX_LAST);
g_array_set_size (cfs, GDK_WIN32_CF_INDEX_LAST); g_array_set_size (cfs, GDK_WIN32_CF_INDEX_LAST);
@ -2681,8 +2681,8 @@ _gdk_win32_transmute_contentformat (const gchar *from_contentformat,
} }
gint gint
_gdk_win32_add_contentformat_to_pairs (const gchar *contentformat, _gdk_win32_add_contentformat_to_pairs (const char *contentformat,
GArray *array) GArray *array)
{ {
gint added_count = 0; gint added_count = 0;
wchar_t *contentformat_w; wchar_t *contentformat_w;

6
gdk/win32/gdkclipdrop-win32.h
View File

@ -24,7 +24,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define _gdk_win32_clipdrop_get() (_win32_clipdrop) #define _gdk_win32_clipdrop_get() (_win32_clipdrop)
#define _gdk_atom_array_index(a, i) (g_array_index (a, GdkAtom, i)) #define _gdk_atom_array_index(a, i) (g_array_index (a, const char *, i))
#define _gdk_win32_clipdrop_atom(i) (_gdk_atom_array_index (_gdk_win32_clipdrop_get ()->known_atoms, i)) #define _gdk_win32_clipdrop_atom(i) (_gdk_atom_array_index (_gdk_win32_clipdrop_get ()->known_atoms, i))
#define _gdk_cf_array_index(a, i) (g_array_index (a, UINT, i)) #define _gdk_cf_array_index(a, i) (g_array_index (a, UINT, i))
#define _gdk_win32_clipdrop_cf(i) (_gdk_cf_array_index (_gdk_win32_clipdrop_get ()->known_clipboard_formats, i)) #define _gdk_win32_clipdrop_cf(i) (_gdk_cf_array_index (_gdk_win32_clipdrop_get ()->known_clipboard_formats, i))
@ -53,7 +53,7 @@ typedef enum {
enum _GdkWin32AtomIndex enum _GdkWin32AtomIndex
{ {
/* GdkAtoms: properties, targets and types */ /* atoms: properties, targets and types */
GDK_WIN32_ATOM_INDEX_GDK_SELECTION = 0, GDK_WIN32_ATOM_INDEX_GDK_SELECTION = 0,
GDK_WIN32_ATOM_INDEX_CLIPBOARD_MANAGER, GDK_WIN32_ATOM_INDEX_CLIPBOARD_MANAGER,
GDK_WIN32_ATOM_INDEX_WM_TRANSIENT_FOR, GDK_WIN32_ATOM_INDEX_WM_TRANSIENT_FOR,
@ -243,7 +243,7 @@ gchar * _gdk_win32_get_clipboard_format_name (UINT
void _gdk_win32_add_w32format_to_pairs (UINT format, void _gdk_win32_add_w32format_to_pairs (UINT format,
GArray *array, GArray *array,
GdkContentFormatsBuilder *builder); GdkContentFormatsBuilder *builder);
gint _gdk_win32_add_contentformat_to_pairs (GdkAtom target, gint _gdk_win32_add_contentformat_to_pairs (const char *target,
GArray *array); GArray *array);
void _gdk_win32_clipboard_default_output_done (GObject *clipboard, void _gdk_win32_clipboard_default_output_done (GObject *clipboard,

2
gdk/win32/gdkdevice-virtual.c
View File

@ -36,7 +36,7 @@ _gdk_device_virtual_set_active (GdkDevice *device,
{ {
GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device); GdkDeviceVirtual *virtual = GDK_DEVICE_VIRTUAL (device);
int n_axes, i; int n_axes, i;
GdkAtom label_atom; const char *label_atom;
GdkAxisUse use; GdkAxisUse use;
gdouble min_value, max_value, resolution; gdouble min_value, max_value, resolution;

26
gdk/win32/gdkprivate-win32.h
View File

@ -294,10 +294,6 @@ GdkWin32Clipdrop *_win32_clipdrop;
GThread *_win32_main_thread; GThread *_win32_main_thread;
void _gdk_win32_dnd_do_dragdrop (void); void _gdk_win32_dnd_do_dragdrop (void);
void _gdk_win32_ole2_dnd_property_change (GdkAtom type,
gint format,
const guchar *data,
gint nelements);
typedef enum { typedef enum {
GDK_WIN32_MODAL_OP_NONE = 0x0, GDK_WIN32_MODAL_OP_NONE = 0x0,
@ -374,28 +370,6 @@ GList *_gdk_win32_display_list_devices (GdkDisplay *dpy);
gboolean _gdk_win32_display_has_pending (GdkDisplay *display); gboolean _gdk_win32_display_has_pending (GdkDisplay *display);
void _gdk_win32_display_queue_events (GdkDisplay *display); void _gdk_win32_display_queue_events (GdkDisplay *display);
gboolean _gdk_win32_selection_owner_set_for_display (GdkDisplay *display,
GdkSurface *owner,
GdkAtom selection,
guint32 time,
gboolean send_event);
void _gdk_win32_display_send_selection_notify (GdkDisplay *display,
GdkSurface *requestor,
GdkAtom selection,
GdkAtom target,
GdkAtom property,
guint32 time);
gint _gdk_win32_display_get_selection_property (GdkDisplay *display,
GdkSurface *requestor,
guchar **data,
GdkAtom *ret_type,
gint *ret_format);
void _gdk_win32_display_convert_selection (GdkDisplay *display,
GdkSurface *requestor,
GdkAtom selection,
GdkAtom target,
guint32 time);
gboolean _gdk_win32_keymap_has_altgr (GdkWin32Keymap *keymap); gboolean _gdk_win32_keymap_has_altgr (GdkWin32Keymap *keymap);
guint8 _gdk_win32_keymap_get_active_group (GdkWin32Keymap *keymap); guint8 _gdk_win32_keymap_get_active_group (GdkWin32Keymap *keymap);
guint8 _gdk_win32_keymap_get_rshift_scancode (GdkWin32Keymap *keymap); guint8 _gdk_win32_keymap_get_rshift_scancode (GdkWin32Keymap *keymap);