diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 15 | ||||
| -rw-r--r-- | gdk/quartz/gdkproperty-quartz.c | 6 |
3 files changed, 25 insertions, 11 deletions
@@ -1,21 +1,28 @@ -2006-01-16 Anders Carlsson <andersca@mac.com> - - Reviewed by NOBODY (OOPS!). +2006-01-16 Anders Carlsson <andersca@imendio.com> * gdk/quartz/gdkdisplay-quartz.c: * gdk/quartz/gdkevents-quartz.c: (gdk_keyboard_grab): (gdk_display_keyboard_ungrab): (gdk_keyboard_grab_info_libgtk_only): - (_gdk_quartz_send_map_events): (find_window_for_event): + Implement keyboard grabs. + + (_gdk_quartz_send_map_events): * gdk/quartz/gdkmain-quartz.c: * gdk/quartz/gdkprivate-quartz.h: + New function that synthesizes map events. + * gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_init): + The root window is always visible. + (all_parents_shown): (show_window_internal): + Send map events. + (gdk_window_hide): + Ungrab keyboard and pointer 2006-01-15 Kristian Rietveld <kris@gtk.org> diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9930bd6634..44c0269315 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,21 +1,28 @@ -2006-01-16 Anders Carlsson <andersca@mac.com> - - Reviewed by NOBODY (OOPS!). +2006-01-16 Anders Carlsson <andersca@imendio.com> * gdk/quartz/gdkdisplay-quartz.c: * gdk/quartz/gdkevents-quartz.c: (gdk_keyboard_grab): (gdk_display_keyboard_ungrab): (gdk_keyboard_grab_info_libgtk_only): - (_gdk_quartz_send_map_events): (find_window_for_event): + Implement keyboard grabs. + + (_gdk_quartz_send_map_events): * gdk/quartz/gdkmain-quartz.c: * gdk/quartz/gdkprivate-quartz.h: + New function that synthesizes map events. + * gdk/quartz/gdkwindow-quartz.c: (_gdk_windowing_window_init): + The root window is always visible. + (all_parents_shown): (show_window_internal): + Send map events. + (gdk_window_hide): + Ungrab keyboard and pointer 2006-01-15 Kristian Rietveld <kris@gtk.org> diff --git a/gdk/quartz/gdkproperty-quartz.c b/gdk/quartz/gdkproperty-quartz.c index 07fdbafcee..0456d25e25 100644 --- a/gdk/quartz/gdkproperty-quartz.c +++ b/gdk/quartz/gdkproperty-quartz.c @@ -119,7 +119,7 @@ ensure_atom_tables (void) names_to_atoms = g_hash_table_new (g_str_hash, g_str_equal); atoms_to_names = g_ptr_array_sized_new (G_N_ELEMENTS (xatoms_offset)); - + for (i = 0; i < G_N_ELEMENTS (xatoms_offset); i++) { g_hash_table_insert(names_to_atoms, (gchar *)xatoms_string + xatoms_offset[i], GINT_TO_POINTER (i)); @@ -140,7 +140,7 @@ intern_atom_internal (const gchar *atom_name, gboolean allocate) return result; result = GINT_TO_POINTER (atoms_to_names->len); - name = allocate ? g_strdup (atom_name) : (gchar *)allocate; + name = allocate ? g_strdup (atom_name) : (gchar *)atom_name; g_hash_table_insert(names_to_atoms, name, result); g_ptr_array_add(atoms_to_names, name); @@ -149,7 +149,7 @@ intern_atom_internal (const gchar *atom_name, gboolean allocate) GdkAtom gdk_atom_intern (const gchar *atom_name, - gboolean only_if_exists) + gboolean only_if_exists) { return intern_atom_internal (atom_name, TRUE); } |