[gtk+/xi2-for-master: 32/35] Merge branch 'master' into xi2-for-master
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/xi2-for-master: 32/35] Merge branch 'master' into xi2-for-master
- Date: Tue, 25 May 2010 18:17:00 +0000 (UTC)
commit e5356bc4bd92db962de7a76bbcac08c8f045e15d
Merge: d6007e8 b5ae99b
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 25 12:48:47 2010 -0400
Merge branch 'master' into xi2-for-master
Conflicts:
docs/reference/gdk/gdk3-sections.txt
docs/reference/gtk/gtk3-sections.txt
gdk/gdk.symbols
gdk/gdkdisplay.h
gdk/gdkdnd.h
gdk/gdkinput.h
gdk/gdkwindow.h
gdk/quartz/gdkinput.c
gdk/win32/gdkinput.c
gdk/x11/gdkevents-x11.c
gdk/x11/gdkinput.c
README.in | 14 +-
configure.ac | 2 +-
docs/reference/gdk-pixbuf/Makefile.am | 35 +-
docs/reference/gdk/gdk-docs.sgml | 8 +
docs/reference/gdk/gdk3-sections.txt | 36 +-
docs/reference/gdk/tmpl/general.sgml | 9 +-
docs/reference/gtk/Makefile.am | 2 +-
docs/reference/gtk/compiling.sgml | 9 +
docs/reference/gtk/gtk3-sections.txt | 3 +-
docs/reference/gtk/tmpl/.gitignore | 3 +
docs/reference/gtk/tmpl/gtkrange.sgml | 424 ------------
.../reference/gtk/tmpl/gtkrecentchooserdialog.sgml | 96 ---
docs/reference/gtk/tmpl/gtkrecentchoosermenu.sgml | 92 ---
docs/reference/gtk/tmpl/gtktoolbar.sgml | 22 -
docs/reference/gtk/x11.sgml | 54 --
docs/tutorial/gtk-tut.sgml | 1 -
examples/calendar/calendar.c | 2 +-
gdk/Makefile.am | 5 +-
gdk/gdk.symbols | 40 +-
gdk/gdkcolor.h | 8 +-
gdk/gdkcursor.h | 4 +-
gdk/gdkdisplay.h | 28 +-
gdk/gdkdnd.c | 73 ++
gdk/gdkdnd.h | 33 +-
gdk/gdkgc.h | 10 +-
gdk/gdkimage.c | 162 +++++
gdk/gdkimage.h | 36 +-
gdk/gdkkeys.h | 2 +-
gdk/gdkpixmap.h | 4 +-
gdk/gdkscreen.h | 12 +-
gdk/gdkvisual.c | 189 ++++++
gdk/gdkvisual.h | 51 +-
gdk/gdkwindow.c | 210 ++++++-
gdk/gdkwindow.h | 81 ++-
gdk/x11/gdkdisplay-x11.c | 4 +
gtk/gtk.symbols | 1 -
gtk/gtkadjustment.c | 6 +-
gtk/gtkbox.h | 7 +-
gtk/gtkcombobox.c | 8 +-
gtk/gtkentry.c | 6 +-
gtk/gtkentrycompletion.c | 51 +-
gtk/gtkenums.h | 44 +-
gtk/gtkfilechooser.h | 2 +-
gtk/gtkicontheme.c | 15 +-
gtk/gtkiconview.c | 52 +-
gtk/gtkpaned.c | 2 +-
gtk/gtkrange.c | 40 +-
gtk/gtkrecentchooserdialog.c | 46 ++
gtk/gtkrecentchoosermenu.c | 28 +
gtk/gtkscrolledwindow.c | 8 +-
gtk/gtkspinbutton.c | 9 -
gtk/gtktoolbar.c | 692 +++-----------------
gtk/gtktoolbar.h | 22 -
gtk/gtktreeview.c | 24 +-
gtk/gtkwidget.c | 6 +-
modules/printbackends/cups/gtkprintbackendcups.c | 6 +-
po/am.po | 2 +-
po/as.po | 2 +-
po/az.po | 2 +-
po/az_IR.po | 2 +-
po/be.po | 2 +-
po/bs.po | 2 +-
po/dz.po | 2 +-
po/fa.po | 2 +-
po/hr.po | 2 +-
po/hy.po | 2 +-
po/ia.po | 2 +-
po/is.po | 2 +-
po/li.po | 2 +-
po/mi.po | 2 +-
po/mk.po | 2 +-
po/mn.po | 2 +-
po/ms.po | 2 +-
po/my.po | 4 +-
po/nds.po | 4 +-
po/ne.po | 2 +-
po/nso.po | 2 +-
po/oc.po | 2 +-
po/rw.po | 2 +-
po/sr ije po | 2 +-
po/ta.po | 2 +-
po/tk.po | 2 +-
po/tt.po | 2 +-
po/ur.po | 2 +-
po/xh.po | 2 +-
po/yi.po | 2 +-
tests/stresstest-toolbar.c | 5 +-
tests/testtoolbar.c | 1 -
88 files changed, 1271 insertions(+), 1638 deletions(-)
---
diff --cc docs/reference/gdk/gdk3-sections.txt
index fa1dfef,e9be5c5..903e9b8
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@@ -1027,12 -1035,8 +1053,14 @@@ GdkInputMod
GdkDeviceKey
GdkDeviceAxis
GdkAxisUse
+GdkGrabOwnership
+gdk_enable_multidevice
+gdk_device_manager_get_display
+gdk_device_manager_list_devices
+
+<SUBSECTION>
+ gdk_devices_list
+ gdk_device_get_name
gdk_device_set_source
gdk_device_get_source
gdk_device_set_mode
@@@ -1041,16 -1045,8 +1069,16 @@@ gdk_device_set_ke
gdk_device_get_key
gdk_device_set_axis_use
gdk_device_get_axis_use
-gdk_device_get_core_pointer
+gdk_device_get_associated_device
+gdk_device_get_device_type
+gdk_device_get_display
gdk_device_get_has_cursor
+gdk_device_get_n_axes
- gdk_device_get_name
++gdk_device_get_core_pointer
+
+<SUBSECTION>
+gdk_device_grab
+gdk_device_ungrab
<SUBSECTION>
gdk_device_get_state
@@@ -1264,8 -1236,10 +1292,12 @@@ GdkDragContex
GdkDragAction
gdk_drag_status
gdk_drag_drop_succeeded
+ gdk_drag_context_get_action
+ gdk_drag_context_get_actions
+ gdk_drag_context_get_suggested_action
+ gdk_drag_context_list_targets
+gdk_drag_context_get_device
+gdk_drag_context_set_device
<SUBSECTION Standard>
GDK_DRAG_CONTEXT
diff --cc gdk/gdk.symbols
index 74d3664,36b111f..0b78381
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@@ -720,16 -654,20 +724,23 @@@ gdk_window_resiz
gdk_window_move_resize
gdk_window_scroll
gdk_window_move_region
- gdk_window_set_background
- gdk_window_set_back_pixmap
- gdk_window_set_cursor
+ gdk_window_get_accept_focus
+ gdk_window_get_back_pixmap
+ gdk_window_get_background
+ gdk_window_get_composited
gdk_window_get_cursor
+ gdk_window_get_deskrelative_origin
+ gdk_window_get_focus_on_map
gdk_window_get_geometry
+ gdk_window_get_modal_hint
gdk_window_get_origin
gdk_window_get_root_coords
+gdk_window_get_deskrelative_origin
+gdk_window_set_support_multidevice
+gdk_window_get_support_multidevice
+ gdk_window_set_background
+ gdk_window_set_back_pixmap
+ gdk_window_set_cursor
gdk_window_shape_combine_mask
gdk_window_shape_combine_region
gdk_window_set_child_shapes
diff --cc gdk/gdkdisplay.h
index 00c3684,5de93ef..55fcf38
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@@ -91,29 -81,28 +91,29 @@@ struct _GdkDispla
/* Information for determining if the latest button click
* is part of a double-click or triple-click
*/
- GHashTable *multiple_click_info;
- guint32 GSEAL (button_click_time[2]); /* The last 2 button click times. */
- GdkWindow *GSEAL (button_window[2]); /* The last 2 windows to receive button presses. */
- gint GSEAL (button_number[2]); /* The last 2 buttons to be pressed. */
++ GHashTable *GSEAL (multiple_click_info);
- guint double_click_time; /* Maximum time between clicks in msecs */
- GdkDevice *core_pointer; /* Core pointer device */
+ guint GSEAL (double_click_time); /* Maximum time between clicks in msecs */
+ GdkDevice *GSEAL (core_pointer); /* Core pointer device */
- const GdkDisplayDeviceHooks *device_hooks; /* Current hooks for querying pointer */
- const GdkDisplayPointerHooks *GSEAL (pointer_hooks); /* Current hooks for querying pointer */
++ const GdkDisplayDeviceHooks *GSEAL (device_hooks); /* Current hooks for querying pointer */
- guint closed : 1; /* Whether this display has been closed */
- guint ignore_core_events : 1; /* Don't send core motion and button event */
+ guint GSEAL (closed) : 1; /* Whether this display has been closed */
+ guint GSEAL (ignore_core_events) : 1; /* Don't send core motion and button event */
- guint double_click_distance; /* Maximum distance between clicks in pixels */
+ guint GSEAL (double_click_distance); /* Maximum distance between clicks in pixels */
- gint GSEAL (button_x[2]); /* The last 2 button click positions. */
- gint GSEAL (button_y[2]);
- GHashTable *device_grabs;
- GHashTable *motion_hint_info;
- GList *GSEAL (pointer_grabs);
- GdkKeyboardGrabInfo GSEAL (keyboard_grab);
- GdkPointerWindowInfo GSEAL (pointer_info);
++ GHashTable *GSEAL (device_grabs);
++ GHashTable *GSEAL (motion_hint_info);
+
+ /* Hashtable containing a GdkPointerWindowInfo for each device */
- GHashTable *pointers_info;
++ GHashTable *GSEAL (pointers_info);
/* Last reported event time from server */
- guint32 last_event_time;
+ guint32 GSEAL (last_event_time);
+
+ /* Device manager associated to the display */
- GdkDeviceManager *device_manager;
++ GdkDeviceManager *GSEAL (device_manager);
};
struct _GdkDisplayClass
diff --cc gdk/gdkdnd.h
index b125882,7fa98a5..2b6ceb0
--- a/gdk/gdkdnd.h
+++ b/gdk/gdkdnd.h
@@@ -108,10 -106,10 +107,14 @@@ struct _GdkDragContextClass
GType gdk_drag_context_get_type (void) G_GNUC_CONST;
GdkDragContext * gdk_drag_context_new (void);
- void gdk_drag_context_set_device (GdkDragContext *context,
- GdkDevice *device);
- GdkDevice * gdk_drag_context_get_device (GdkDragContext *context);
++void gdk_drag_context_set_device (GdkDragContext *context,
++ GdkDevice *device);
++GdkDevice * gdk_drag_context_get_device (GdkDragContext *context);
+
+ GList *gdk_drag_context_list_targets (GdkDragContext *context);
+ GdkDragAction gdk_drag_context_get_actions (GdkDragContext *context);
+ GdkDragAction gdk_drag_context_get_suggested_action (GdkDragContext *context);
+ GdkDragAction gdk_drag_context_get_action (GdkDragContext *context);
/* Destination side */
diff --cc gdk/gdkwindow.h
index a6eb835,0bd254a..640f6af
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@@ -505,51 -505,50 +505,51 @@@ struct _GdkWindowObjec
{
GdkDrawable parent_instance;
- GdkDrawable *impl; /* window-system-specific delegate object */
+ GdkDrawable *GSEAL (impl); /* window-system-specific delegate object */
- GdkWindowObject *parent;
+ GdkWindowObject *GSEAL (parent);
- gpointer user_data;
+ gpointer GSEAL (user_data);
- gint x;
- gint y;
+ gint GSEAL (x);
+ gint GSEAL (y);
- gint extension_events;
+ gint GSEAL (extension_events);
- GList *filters;
- GList *children;
+ GList *GSEAL (filters);
+ GList *GSEAL (children);
- GdkColor bg_color;
- GdkPixmap *bg_pixmap;
+ GdkColor GSEAL (bg_color);
+ GdkPixmap *GSEAL (bg_pixmap);
- GSList *paint_stack;
+ GSList *GSEAL (paint_stack);
- GdkRegion *update_area;
- guint update_freeze_count;
+ GdkRegion *GSEAL (update_area);
+ guint GSEAL (update_freeze_count);
- guint8 window_type;
- guint8 depth;
- guint8 resize_count;
+ guint8 GSEAL (window_type);
+ guint8 GSEAL (depth);
+ guint8 GSEAL (resize_count);
- GdkWindowState state;
+ GdkWindowState GSEAL (state);
- guint guffaw_gravity : 1;
- guint input_only : 1;
- guint modal_hint : 1;
- guint composited : 1;
+ guint GSEAL (guffaw_gravity) : 1;
+ guint GSEAL (input_only) : 1;
+ guint GSEAL (modal_hint) : 1;
+ guint GSEAL (composited) : 1;
- guint destroyed : 2;
+ guint GSEAL (destroyed) : 2;
- guint accept_focus : 1;
- guint focus_on_map : 1;
- guint shaped : 1;
- guint support_multidevice : 1;
+ guint GSEAL (accept_focus) : 1;
+ guint GSEAL (focus_on_map) : 1;
+ guint GSEAL (shaped) : 1;
++ guint GSEAL (support_multidevice) : 1;
- GdkEventMask event_mask;
+ GdkEventMask GSEAL (event_mask);
- guint update_and_descendants_freeze_count;
+ guint GSEAL (update_and_descendants_freeze_count);
- GdkWindowRedirect *redirect;
+ GdkWindowRedirect *GSEAL (redirect);
};
#endif
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
