callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo so ctrl gets passed on to the gdk event.

Browse Source 
2006-02-20  Anders Carlsson  <andersca@mac.com>

        * gdk/quartz/gdkevents-quartz.c:
        (get_keyboard_modifiers_from_nsevent):
        Fix typo so ctrl gets passed on to the gdk event.

        * gdk/quartz/gdkproperty-quartz.c:
        (gdk_atom_name):
        g_strdup the atom name.
This commit is contained in:
Anders Carlsson
2006-02-20 11:07:25 +00:00
committed by Anders Carlsson
parent 3cb8a43a25
commit cae6c15d65
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-02-20 Anders Carlsson <andersca@mac.com>
* gdk/quartz/gdkevents-quartz.c:
(get_keyboard_modifiers_from_nsevent):
Fix typo so ctrl gets passed on to the gdk event.
* gdk/quartz/gdkproperty-quartz.c:
(gdk_atom_name):
g_strdup the atom name.
2006-02-20 Tor Lillqvist <tml@novell.com> 2006-02-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes):

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2006-02-20 Anders Carlsson <andersca@mac.com>
* gdk/quartz/gdkevents-quartz.c:
(get_keyboard_modifiers_from_nsevent):
Fix typo so ctrl gets passed on to the gdk event.
* gdk/quartz/gdkproperty-quartz.c:
(gdk_atom_name):
g_strdup the atom name.
2006-02-20 Tor Lillqvist <tml@novell.com> 2006-02-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes): * gdk/win32/gdkdisplay-win32.c (gdk_display_supports_shapes):

2
gdk/quartz/gdkevents-quartz.c
View File

@ -612,7 +612,7 @@ get_keyboard_modifiers_from_nsevent (NSEvent *nsevent)
modifiers |= GDK_SHIFT_MASK; modifiers |= GDK_SHIFT_MASK;
if (nsflags & NSControlKeyMask) if (nsflags & NSControlKeyMask)
modifiers |= GDK_CONTROL_MASK; modifiers |= GDK_CONTROL_MASK;
if (nsflags & NSControlKeyMask) if (nsflags & NSCommandKeyMask)
modifiers |= GDK_MOD1_MASK; modifiers |= GDK_MOD1_MASK;
/* FIXME: Support GDK_BUTTON_MASK */ /* FIXME: Support GDK_BUTTON_MASK */

2
gdk/quartz/gdkproperty-quartz.c
View File

@ -170,7 +170,7 @@ gdk_atom_name (GdkAtom atom)
if (GPOINTER_TO_INT (atom) >= atoms_to_names->len) if (GPOINTER_TO_INT (atom) >= atoms_to_names->len)
return NULL; return NULL;
return g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)); return g_strdup (g_ptr_array_index (atoms_to_names, GPOINTER_TO_INT (atom)));
} }
void void