[gtk: 8/8] Merge branch 'rename-window-to-surface' into 'master'
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 8/8] Merge branch 'rename-window-to-surface' into 'master'
- Date: Tue, 20 Mar 2018 16:18:45 +0000 (UTC)
commit 695d141f32d8aed14b57cc065554974d541f8ba6
Merge: b83ba41f2d 4ac450b324
Author: Alexander Larsson <alexl redhat com>
Date: Tue Mar 20 16:16:57 2018 +0000
Merge branch 'rename-window-to-surface' into 'master'
Rename window to surface
See merge request GNOME/gtk!72
demos/gtk-demo/application.c | 18 +-
demos/gtk-demo/changedisplay.c | 10 +-
demos/gtk-demo/dnd.c | 2 +-
demos/gtk-demo/drawingarea.c | 2 +-
demos/gtk-demo/fontplane.c | 2 +-
demos/gtk-demo/gtkfishbowl.c | 2 +-
demos/gtk-demo/list_store.c | 2 +-
demos/gtk-demo/main.c | 2 +-
demos/widget-factory/widget-factory.c | 4 +-
docs/developers.txt | 18 +-
docs/dnd_internals.txt | 8 +-
docs/reference/gdk/gdk4-sections.txt | 410 +-
docs/reference/gdk/gdk4.types | 2 +-
docs/reference/gsk/gsk4-sections.txt | 4 +-
docs/reference/gtk/drawing-model.xml | 26 +-
docs/reference/gtk/glossary.xml | 20 +-
docs/reference/gtk/gtk4-sections.txt | 22 +-
docs/reference/gtk/input-handling.xml | 18 +-
docs/reference/gtk/migrating-3to4.xml | 24 +-
docs/reference/gtk/question_index.sgml | 4 +-
docs/tools/shooter.c | 10 +-
docs/widget_system.txt | 24 +-
examples/drawing.c | 4 +-
gdk/broadway/gdkbroadway.h | 2 +-
.../{gdkbroadwaywindow.h => gdkbroadwaysurface.h} | 28 +-
gdk/broadway/gdkdevice-broadway.c | 72 +-
gdk/broadway/gdkdisplay-broadway.c | 10 +-
gdk/broadway/gdkdisplay-broadway.h | 2 +-
gdk/broadway/gdkdnd-broadway.c | 8 +-
gdk/broadway/gdkeventsource.c | 22 +-
gdk/broadway/gdkprivate-broadway.h | 32 +-
...{gdkwindow-broadway.c => gdksurface-broadway.c} | 614 +-
...{gdkwindow-broadway.h => gdksurface-broadway.h} | 40 +-
gdk/broadway/meson.build | 4 +-
gdk/gdk-autocleanup.h | 2 +-
gdk/gdk-private.h | 12 +-
gdk/gdk.h | 2 +-
gdk/gdkcairo.c | 14 +-
gdk/gdkcairo.h | 4 +-
gdk/gdkcursor.c | 4 +-
gdk/gdkdevice.c | 172 +-
gdk/gdkdevice.h | 24 +-
gdk/gdkdeviceprivate.h | 38 +-
gdk/gdkdisplay.c | 176 +-
gdk/gdkdisplay.h | 6 +-
gdk/gdkdisplayprivate.h | 54 +-
gdk/gdkdnd.c | 62 +-
gdk/gdkdnd.h | 8 +-
gdk/gdkdndprivate.h | 8 +-
gdk/gdkdrawcontext.c | 52 +-
gdk/gdkdrawcontext.h | 2 +-
gdk/gdkdrawingcontext.c | 70 +-
gdk/gdkdrawingcontext.h | 2 +-
gdk/gdkevents.c | 72 +-
gdk/gdkevents.h | 66 +-
gdk/gdkeventsprivate.h | 90 +-
gdk/gdkgl.c | 60 +-
gdk/gdkglcontext.c | 38 +-
gdk/gdkglcontext.h | 2 +-
gdk/gdkgltexture.c | 12 +-
gdk/gdkinternals.h | 120 +-
gdk/gdkmonitor.c | 6 +-
gdk/gdkpaintable.c | 2 +-
gdk/gdkpango.c | 4 +-
gdk/gdkpixbuf-drawable.c | 4 +-
gdk/gdkseat.c | 22 +-
gdk/gdkseat.h | 12 +-
gdk/gdkseatdefault.c | 16 +-
gdk/gdkseatprivate.h | 2 +-
gdk/gdksurface.c | 6957 ++++++++++++++++++++
gdk/{gdkwindow.h => gdksurface.h} | 570 +-
gdk/{gdkwindowimpl.c => gdksurfaceimpl.c} | 106 +-
gdk/gdksurfaceimpl.h | 256 +
gdk/gdktypes.h | 88 +-
gdk/gdkvulkancontext.c | 38 +-
gdk/gdkwindow.c | 6957 --------------------
gdk/gdkwindowimpl.h | 256 -
gdk/meson.build | 6 +-
gdk/quartz/GdkQuartzNSWindow.c | 224 +-
gdk/quartz/GdkQuartzNSWindow.h | 4 +-
gdk/quartz/GdkQuartzView.c | 138 +-
gdk/quartz/GdkQuartzView.h | 6 +-
gdk/quartz/gdkdevice-core-quartz.c | 102 +-
gdk/quartz/gdkdisplay-quartz.c | 10 +-
gdk/quartz/gdkdisplay-quartz.h | 10 +-
gdk/quartz/gdkdnd-quartz.c | 6 +-
gdk/quartz/gdkevents-quartz.c | 136 +-
gdk/quartz/gdkglcontext-quartz.c | 2 +-
gdk/quartz/gdkglcontext-quartz.h | 4 +-
gdk/quartz/gdkglobals-quartz.c | 2 +-
gdk/quartz/gdkprivate-quartz.h | 52 +-
gdk/quartz/gdkquartz.h | 2 +-
gdk/quartz/gdkquartzsurface.h | 55 +
gdk/quartz/gdkquartzwindow.h | 55 -
gdk/quartz/gdkscreen-quartz.c | 8 +-
.../{gdkwindow-quartz.c => gdksurface-quartz.c} | 1190 ++--
gdk/quartz/gdksurface-quartz.h | 115 +
gdk/quartz/gdkwindow-quartz.h | 115 -
gdk/quartz/meson.build | 4 +-
gdk/wayland/gdkdevice-wayland.c | 336 +-
gdk/wayland/gdkdisplay-wayland.c | 28 +-
gdk/wayland/gdkdisplay-wayland.h | 2 +-
gdk/wayland/gdkdnd-wayland.c | 92 +-
gdk/wayland/gdkglcontext-wayland.c | 54 +-
gdk/wayland/gdkglcontext-wayland.h | 4 +-
gdk/wayland/gdkprivate-wayland.h | 50 +-
gdk/wayland/gdkselection-wayland.c | 10 +-
.../{gdkwindow-wayland.c => gdksurface-wayland.c} | 1846 +++---
gdk/wayland/gdkvulkancontext-wayland.c | 16 +-
gdk/wayland/gdkwayland.h | 2 +-
.../{gdkwaylandwindow.h => gdkwaylandsurface.h} | 46 +-
gdk/wayland/meson.build | 4 +-
gdk/win32/gdkcursor-win32.c | 2 +-
gdk/win32/gdkdevice-virtual.c | 34 +-
gdk/win32/gdkdevice-win32.c | 52 +-
gdk/win32/gdkdevice-win32.h | 2 +-
gdk/win32/gdkdevice-wintab.c | 54 +-
gdk/win32/gdkdevice-wintab.h | 2 +-
gdk/win32/gdkdevicemanager-win32.c | 46 +-
gdk/win32/gdkdevicemanager-win32.h | 2 +-
gdk/win32/gdkdisplay-win32.c | 20 +-
gdk/win32/gdkdisplay-win32.h | 2 +-
gdk/win32/gdkdnd-win32.c | 260 +-
gdk/win32/gdkevents-win32.c | 564 +-
gdk/win32/gdkgeometry-win32.c | 96 +-
gdk/win32/gdkglcontext-win32.c | 52 +-
gdk/win32/gdkglcontext-win32.h | 4 +-
gdk/win32/gdkmain-win32.c | 24 +-
gdk/win32/gdkmonitor-win32.c | 2 +-
gdk/win32/gdkprivate-win32.h | 88 +-
gdk/win32/gdkscreen-win32.c | 8 +-
gdk/win32/gdkselection-win32.c | 100 +-
gdk/win32/gdkselection-win32.h | 2 +-
.../{gdkwindow-win32.c => gdksurface-win32.c} | 2116 +++---
.../{gdkwindow-win32.h => gdksurface-win32.h} | 64 +-
gdk/win32/gdkvulkancontext-win32.c | 4 +-
gdk/win32/gdkwin32.h | 2 +-
gdk/win32/gdkwin32dnd-private.h | 4 +-
gdk/win32/gdkwin32misc.h | 16 +-
gdk/win32/{gdkwin32window.h => gdkwin32surface.h} | 26 +-
gdk/win32/meson.build | 4 +-
gdk/x11/gdkdevice-core-x11.c | 162 +-
gdk/x11/gdkdevice-xi2.c | 120 +-
gdk/x11/gdkdevicemanager-core-x11.c | 132 +-
gdk/x11/gdkdevicemanager-xi2.c | 130 +-
gdk/x11/gdkdevicemanagerprivate-core.h | 2 +-
gdk/x11/gdkdisplay-x11.c | 438 +-
gdk/x11/gdkdisplay-x11.h | 8 +-
gdk/x11/gdkdnd-x11.c | 560 +-
gdk/x11/gdkeventsource.c | 60 +-
gdk/x11/gdkeventtranslator.c | 20 +-
gdk/x11/gdkeventtranslator.h | 8 +-
gdk/x11/gdkgeometry-x11.c | 54 +-
gdk/x11/gdkglcontext-x11.c | 88 +-
gdk/x11/gdkglcontext-x11.h | 4 +-
gdk/x11/gdkmain-x11.c | 32 +-
gdk/x11/gdkmonitor-x11.c | 10 +-
gdk/x11/gdkprivate-x11.h | 58 +-
gdk/x11/gdkscreen-x11.c | 50 +-
gdk/x11/gdkscreen-x11.h | 6 +-
gdk/x11/gdkselectioninputstream-x11.c | 2 +-
gdk/x11/gdkselectionoutputstream-x11.c | 2 +-
gdk/x11/{gdkwindow-x11.c => gdksurface-x11.c} | 2160 +++---
gdk/x11/{gdkwindow-x11.h => gdksurface-x11.h} | 54 +-
gdk/x11/gdkvulkancontext-x11.c | 6 +-
gdk/x11/gdkx-autocleanups.h | 2 +-
gdk/x11/gdkx.h | 2 +-
gdk/x11/gdkx11display.h | 2 +-
gdk/x11/{gdkx11window.h => gdkx11surface.h} | 64 +-
gdk/x11/gdkxid.c | 24 +-
gdk/x11/meson.build | 4 +-
gdk/x11/xsettings-client.c | 8 +-
gsk/gl/gskglrenderer.c | 28 +-
gsk/gskbroadwayrenderer.c | 16 +-
gsk/gskcairorenderer.c | 6 +-
gsk/gskrenderer.c | 62 +-
gsk/gskrenderer.h | 6 +-
gsk/gskrendererprivate.h | 2 +-
gsk/gskrendernode.c | 2 +-
gsk/vulkan/gskvulkanrender.c | 8 +-
gsk/vulkan/gskvulkanrenderer.c | 16 +-
gtk/a11y/gtkentryaccessible.c | 22 +-
gtk/a11y/gtklabelaccessible.c | 20 +-
gtk/a11y/gtktextcellaccessible.c | 14 +-
gtk/a11y/gtktextviewaccessible.c | 22 +-
gtk/a11y/gtktreeviewaccessible.c | 14 +-
gtk/a11y/gtkwidgetaccessible.c | 22 +-
gtk/a11y/gtkwindowaccessible.c | 30 +-
gtk/gtkaccellabel.c | 2 +-
gtk/gtkactionbar.c | 2 +-
gtk/gtkappchooserwidget.c | 2 +-
gtk/gtkapplication-wayland.c | 8 +-
gtk/gtkapplication-x11.c | 26 +-
gtk/gtkbin.c | 2 +-
gtk/gtkbox.c | 2 +-
gtk/gtkbutton.c | 2 +-
gtk/gtkcalendar.c | 2 +-
gtk/gtkcellrendereraccel.c | 4 +-
gtk/gtkcellview.c | 2 +-
gtk/gtkcenterbox.c | 2 +-
gtk/gtkcolorbutton.c | 2 +-
gtk/gtkcolorplane.c | 4 +-
gtk/gtkcolorswatch.c | 2 +-
gtk/gtkcombobox.c | 2 +-
gtk/gtkdebugupdates.c | 2 +-
gtk/gtkdnd-quartz.c | 52 +-
gtk/gtkdnd.c | 18 +-
gtk/gtkdragdest.c | 6 +-
gtk/gtkdrawingarea.c | 2 +-
gtk/gtkentry.c | 2 +-
gtk/gtkentrycompletion.c | 16 +-
gtk/gtkexpander.c | 2 +-
gtk/gtkfilechooserbutton.c | 2 +-
gtk/gtkfilechoosernativequartz.c | 2 +-
gtk/gtkfilechoosernativewin32.c | 2 +-
gtk/gtkfilechooserwidget.c | 2 +-
gtk/gtkfixed.c | 2 +-
gtk/gtkflowbox.c | 2 +-
gtk/gtkfontbutton.c | 2 +-
gtk/gtkfontchooserwidget.c | 2 +-
gtk/gtkgesture.c | 16 +-
gtk/gtkgizmo.c | 2 +-
gtk/gtkglarea.c | 4 +-
gtk/gtkgrid.c | 2 +-
gtk/gtkheaderbar.c | 36 +-
gtk/gtkicon.c | 2 +-
gtk/gtkicontheme.c | 4 +-
gtk/gtkiconview.c | 4 +-
gtk/gtkimage.c | 2 +-
gtk/gtkimcontextime.c | 80 +-
gtk/gtkimcontextime.h | 4 +-
gtk/gtkimcontextquartz.c | 28 +-
gtk/gtkimcontextsimple.c | 16 +-
gtk/gtkimcontextxim.c | 48 +-
gtk/gtkimmulticontext.c | 2 +-
gtk/gtkinvisible.c | 10 +-
gtk/gtklabel.c | 2 +-
gtk/gtklayout.c | 2 +-
gtk/gtklevelbar.c | 2 +-
gtk/gtklistbox.c | 2 +-
gtk/gtkmagnifier.c | 2 +-
gtk/gtkmain.c | 76 +-
gtk/gtkmediacontrols.c | 2 +-
gtk/gtkmediastream.c | 18 +-
gtk/gtkmediastream.h | 8 +-
gtk/gtkmenu.c | 104 +-
gtk/gtkmenu.h | 2 +-
gtk/gtkmenubutton.c | 2 +-
gtk/gtkmenuitem.c | 8 +-
gtk/gtkmenuprivate.h | 4 +-
gtk/gtkmenushell.c | 6 +-
gtk/gtkmnemonichash.c | 6 +-
gtk/gtknotebook.c | 38 +-
gtk/gtkoverlay.c | 2 +-
gtk/gtkpaned.c | 2 +-
gtk/gtkpathbar.c | 2 +-
gtk/gtkpopover.c | 44 +-
gtk/gtkprintoperation-win32.c | 6 +-
gtk/gtkprintunixdialog.c | 2 +-
gtk/gtkprogressbar.c | 2 +-
gtk/gtkrange.c | 2 +-
gtk/gtkrevealer.c | 2 +-
gtk/gtkscrollbar.c | 2 +-
gtk/gtkscrolledwindow.c | 2 +-
gtk/gtkseparator.c | 2 +-
gtk/gtkseparatortoolitem.c | 2 +-
gtk/gtksettings.c | 2 +-
gtk/gtkshortcutsshortcut.c | 2 +-
gtk/gtkshortcutswindow.c | 2 +-
gtk/gtkspinbutton.c | 2 +-
gtk/gtkspinner.c | 2 +-
gtk/gtkstack.c | 2 +-
gtk/gtkstackswitcher.c | 2 +-
gtk/gtkstatusbar.c | 2 +-
gtk/gtkswitch.c | 2 +-
gtk/gtktextutil.c | 4 +-
gtk/gtktextview.c | 46 +-
gtk/gtktextview.h | 2 +-
gtk/gtktoolbar.c | 4 +-
gtk/gtktooltip.c | 56 +-
gtk/gtktooltipprivate.h | 2 +-
gtk/gtktreeview.c | 184 +-
gtk/gtktreeview.h | 4 +-
gtk/gtkvideo.c | 10 +-
gtk/gtkviewport.c | 2 +-
gtk/gtkwidget.c | 442 +-
gtk/gtkwidget.h | 32 +-
gtk/gtkwidgetfocus.c | 8 +-
gtk/gtkwidgetprivate.h | 32 +-
gtk/gtkwin32theme.c | 6 +-
gtk/gtkwindow.c | 698 +-
gtk/gtkwindow.h | 6 +-
gtk/gtkwindowprivate.h | 2 +-
gtk/inspector/general.c | 16 +-
gtk/inspector/gtkstackcombo.c | 2 +-
gtk/inspector/inspect-button.c | 24 +-
gtk/inspector/recorder.c | 6 +-
gtk/inspector/recorder.h | 2 +-
gtk/inspector/rendernodeview.c | 2 +-
gtk/inspector/visual.c | 2 +-
gtk/inspector/window.c | 2 +-
gtk/inspector/window.h | 2 +-
tests/motion-compression.c | 2 +-
tests/rendernode.c | 6 +-
tests/showrendernode.c | 12 +-
tests/testfullscreen.c | 14 +-
tests/testgtk.c | 82 +-
tests/testinput.c | 4 +-
tests/testtooltips.c | 2 +-
tests/testwidgetfocus.c | 2 +-
tests/testxinerama.c | 4 +-
testsuite/gsk/compare-render.c | 6 +-
testsuite/gsk/test-render-nodes.c | 8 +-
testsuite/gtk/defaultvalue.c | 8 +-
testsuite/gtk/gestures.c | 12 +-
testsuite/gtk/notify.c | 8 +-
testsuite/gtk/object.c | 2 +-
testsuite/gtk/objects-finalize.c | 2 +-
testsuite/gtk/templates.c | 4 +-
testsuite/reftests/reftest-snapshot.c | 24 +-
320 files changed, 16753 insertions(+), 16753 deletions(-)
---
diff --cc gtk/gtkgrid.c
index 3419756f91,674ba18025..65dd19b475
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@@ -1699,8 -1729,9 +1699,8 @@@ gtk_grid_init (GtkGrid *grid
{
GtkGridPrivate *priv = gtk_grid_get_instance_private (grid);
- gtk_widget_set_has_window (GTK_WIDGET (grid), FALSE);
+ gtk_widget_set_has_surface (GTK_WIDGET (grid), FALSE);
- priv->children = NULL;
priv->orientation = GTK_ORIENTATION_HORIZONTAL;
priv->baseline_row = 0;
diff --cc gtk/gtkpaned.c
index d6d0173c9a,62cd9d8088..75f441a0f3
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@@ -1496,12 -1494,15 +1496,12 @@@ connect_drag_gesture_signals (GtkPane
static void
gtk_paned_init (GtkPaned *paned)
{
- GtkPanedPrivate *priv;
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
GtkGesture *gesture;
- gtk_widget_set_has_window (GTK_WIDGET (paned), FALSE);
+ gtk_widget_set_has_surface (GTK_WIDGET (paned), FALSE);
gtk_widget_set_can_focus (GTK_WIDGET (paned), TRUE);
- paned->priv = gtk_paned_get_instance_private (paned);
- priv = paned->priv;
-
priv->orientation = GTK_ORIENTATION_HORIZONTAL;
priv->child1 = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
