[gtk+/wip/otte/gtk4: 34/121] API: Remove GtkPlug, GtkSocket and GtkWin32EmbedWidget



commit bc90dfb46b137aab766cf591b6e8a7ec59b4e1ec
Author: Benjamin Otte <otte redhat com>
Date:   Mon Oct 3 18:30:40 2016 +0200

    API: Remove GtkPlug, GtkSocket and GtkWin32EmbedWidget

 docs/reference/gtk/Makefile.am       |    5 -
 docs/reference/gtk/gtk-docs.sgml     |    6 -
 docs/reference/gtk/gtk3-sections.txt |   43 -
 docs/reference/gtk/gtk3.types.in     |    3 -
 docs/reference/gtk/x11.sgml          |    7 -
 gtk/Makefile.am                      |   35 +-
 gtk/a11y/gtkaccessibility.c          |   12 -
 gtk/a11y/gtktoplevelaccessible.c     |    7 -
 gtk/gtkdnd.c                         |   14 +-
 gtk/gtkplug.c                        | 1401 -----------------------------
 gtk/gtkplug.h                        |  103 ---
 gtk/gtksocket.c                      | 1621 ----------------------------------
 gtk/gtksocket.h                      |   89 --
 gtk/gtksocketprivate.h               |   61 --
 gtk/gtktestutils.c                   |    2 +-
 gtk/gtkwidget.c                      |   19 +-
 gtk/gtkwin32embed.c                  |  131 ---
 gtk/gtkwin32embed.h                  |   93 --
 gtk/gtkwin32embedwidget.c            |  385 --------
 gtk/gtkwin32embedwidget.h            |   75 --
 gtk/gtkwindow.c                      |   24 +-
 gtk/gtkx-autocleanups.h              |   31 -
 gtk/gtkx.h                           |   36 -
 gtk/gtkxembed.c                      |  242 -----
 gtk/gtkxembed.h                      |   47 -
 gtk/makefile.msc.in                  |    2 -
 po-properties/POTFILES.in            |    2 -
 po/POTFILES.in                       |    2 -
 tests/Makefile.am                    |   15 -
 tests/testsocket.c                   |  404 ---------
 tests/testsocket_child.c             |   65 --
 tests/testsocket_common.c            |  286 ------
 testsuite/gtk/notify.c               |   11 -
 33 files changed, 12 insertions(+), 5267 deletions(-)
---
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 846372a..5f2ab93 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -157,7 +157,6 @@ IGNORE_HFILES = \
        gtksidebarrowprivate.h          \
        gtksizegroup-private.h          \
        gtksizerequestcacheprivate.h    \
-       gtksocketprivate.h              \
        gtkstyleanimationprivate.h      \
        gtkstylecascadeprivate.h        \
        gtkstylecontextprivate.h        \
@@ -233,7 +232,6 @@ IGNORE_HFILES = \
        gtksearchenginesimple.h         \
        gtksearchenginequartz.h         \
        gtksequence.h                   \
-       gtksocketprivate.h              \
        gtktextbtree.h                  \
        gtktextbufferserialize.h        \
        gtktextdisplay.h                \
@@ -248,9 +246,6 @@ IGNORE_HFILES = \
        gtktreedatalist.h               \
        gtktreemenu.h                   \
        gtktypebuiltins.h               \
-       gtkxembed.h                     \
-       gtkwin32embed.h                 \
-       gtkwin32embedwidget.h           \
        gtkwindow-decorate.h            \
        xdgmime                         \
        xembed.h
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index a44a5b2..8bddf33 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -274,12 +274,6 @@
       <xi:include href="xml/gtknativedialog.xml" />
     </chapter>
 
-    <chapter id="PlugSocket">
-      <title>Cross-process Embedding</title>
-      <xi:include href="xml/gtkplug.xml" />
-      <xi:include href="xml/gtksocket.xml" />
-    </chapter>
-
     <chapter id="RecentDocuments">
       <title>Recently Used Documents</title>
       <xi:include href="xml/gtkrecentmanager.xml" />
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index b3155a6..4c613db 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -2678,29 +2678,6 @@ gtk_places_sidebar_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkplug</FILE>
-<TITLE>GtkPlug</TITLE>
-GtkPlug
-gtk_plug_construct
-gtk_plug_construct_for_display
-gtk_plug_new
-gtk_plug_new_for_display
-gtk_plug_get_id
-gtk_plug_get_embedded
-gtk_plug_get_socket_window
-<SUBSECTION Standard>
-GTK_PLUG
-GTK_IS_PLUG
-GTK_TYPE_PLUG
-GTK_PLUG_CLASS
-GTK_IS_PLUG_CLASS
-GTK_PLUG_GET_CLASS
-<SUBSECTION Private>
-GtkPlugPrivate
-gtk_plug_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkprogressbar</FILE>
 <TITLE>GtkProgressBar</TITLE>
 GtkProgressBar
@@ -3346,26 +3323,6 @@ gtk_size_group_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtksocket</FILE>
-<TITLE>GtkSocket</TITLE>
-GtkSocket
-gtk_socket_new
-gtk_socket_add_id
-gtk_socket_get_id
-gtk_socket_get_plug_window
-<SUBSECTION Standard>
-GTK_SOCKET
-GTK_IS_SOCKET
-GTK_TYPE_SOCKET
-GTK_SOCKET_CLASS
-GTK_IS_SOCKET_CLASS
-GTK_SOCKET_GET_CLASS
-<SUBSECTION Private>
-GtkSocketPrivate
-gtk_socket_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkspinbutton</FILE>
 <TITLE>GtkSpinButton</TITLE>
 GtkSpinButton
diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index 54bc119..922a902 100644
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -1,4 +1,3 @@
-#include <gtk/gtkx.h>
 #include <gtk/gtkunixprint.h>
 
 gtk_about_dialog_get_type
@@ -138,7 +137,6 @@ gtk_page_setup_get_type
 gtk_paned_get_type
 gtk_paper_size_get_type
 gtk_places_sidebar_get_type
-@ENABLE_ON_X11@gtk_plug_get_type
 gtk_popover_get_type
 gtk_popover_menu_get_type
 @DISABLE_ON_W32@gtk_printer_get_type
@@ -179,7 +177,6 @@ gtk_shortcuts_section_get_type
 gtk_shortcuts_group_get_type
 gtk_shortcuts_shortcut_get_type
 gtk_size_group_get_type
-@ENABLE_ON_X11@gtk_socket_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
diff --git a/docs/reference/gtk/x11.sgml b/docs/reference/gtk/x11.sgml
index 5039e8a..6a74ed5 100644
--- a/docs/reference/gtk/x11.sgml
+++ b/docs/reference/gtk/x11.sgml
@@ -31,13 +31,6 @@ see <link linkend="gdk-X-Window-System-Interaction">GDK X Window
 System interaction</link> in the GDK manual.
 </para>
 
-<para>
-GTK+ includes an cross-process embedding facility in the form of
-the #GtkSocket and #GtkPlug widgets. These are X11-specific, and
-you have to include the <filename>gtk/gtkx.h</filename> header
-to use them.
-</para>
-
 <refsect2 id="x11-cmdline">
 <title>X11-specific commandline options</title>
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 31558c5..6da3a2a 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -122,8 +122,6 @@ include $(srcdir)/inspector/Makefile.inc
 gtk_public_h_sources =                 \
        gtk.h                   \
        gtk-autocleanups.h      \
-       gtkx.h                  \
-       gtkx-autocleanups.h     \
        gtk-a11y.h              \
        gtkaboutdialog.h        \
        gtkaccelgroup.h         \
@@ -255,7 +253,6 @@ gtk_public_h_sources =              \
        gtkpaned.h              \
        gtkpapersize.h          \
        gtkplacessidebar.h      \
-       gtkplug.h               \
        gtkpopover.h            \
        gtkpopovermenu.h        \
        gtkprintcontext.h       \
@@ -296,7 +293,6 @@ gtk_public_h_sources =              \
        gtkstacksidebar.h       \
        gtksizegroup.h          \
        gtksizerequest.h        \
-       gtksocket.h             \
        gtkspinbutton.h         \
        gtkspinner.h            \
        gtkstack.h              \
@@ -555,7 +551,6 @@ gtk_private_h_sources =             \
        gtksidebarrowprivate.h  \
        gtksizegroup-private.h  \
        gtksizerequestcacheprivate.h    \
-       gtksocketprivate.h      \
        gtkstyleanimationprivate.h \
        gtkstylecascadeprivate.h \
        gtkstylecontextprivate.h \
@@ -1020,9 +1015,6 @@ gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
 gtk_use_x11_c_sources =        \
-       gtkplug.c               \
-       gtksocket.c             \
-       gtkxembed.c             \
        gtkapplication-x11.c    \
        gtkmountoperation-x11.c
 
@@ -1033,8 +1025,6 @@ gtk_use_wayland_or_x11_c_sources = \
        gtkapplication-dbus.c
 
 gtk_use_win32_c_sources =      \
-       gtkwin32embed.c         \
-       gtkwin32embedwidget.c   \
        gtkmountoperation-stub.c
 gtk_use_quartz_c_sources =     \
        gtksearchenginequartz.c \
@@ -1044,12 +1034,8 @@ gtk_use_quartz_c_sources =       \
        gtkquartz.c
 gtk_use_stub_c_sources =       \
        gtkmountoperation-stub.c
-gtk_use_x11_private_h_sources =        \
-       gtkxembed.h             \
-       xembed.h
 if USE_X11
 gtk_c_sources += $(gtk_use_x11_c_sources)
-gtk_private_h_sources += $(gtk_use_x11_private_h_sources)
 endif
 
 if USE_WAYLAND
@@ -1066,12 +1052,8 @@ else
 endif
 endif
 
-gtk_use_win32_private_h_sources =      \
-       gtkwin32embed.h         \
-       gtkwin32embedwidget.h
 if USE_WIN32
 gtk_c_sources += $(gtk_use_win32_c_sources)
-gtk_private_h_sources += $(gtk_use_win32_private_h_sources)
 endif
 
 gtk_use_quartz_private_h_sources =     \
@@ -1087,8 +1069,6 @@ gtk_all_private_h_sources = \
        $(a11y_private_h_sources) \
        $(deprecated_private_h_sources) \
        $(gtk_private_h_sources) \
-       $(gtk_use_x11_private_h_sources) \
-       $(gtk_use_win32_private_h_sources) \
        $(gtk_use_quartz_private_h_sources)
 
 if !USE_X11
@@ -1378,12 +1358,12 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.
 
 
 gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h 
$(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
-       $(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \
+       $(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtk.h>') > xgen-gtfsrc.c && \
          echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
          ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
-         $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef 
GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
+         $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' 
xgen-gtf \
        && cp xgen-gtf $@ && rm -f xgen-gtf
 gtktestutils.c: gtktypefuncs.c
 
@@ -1525,7 +1505,7 @@ distclean-local:
        fi
 
 if HAVE_INTROSPECTION
-introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, 
$(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS))
+introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) 
$(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS))
 
 introspection_files = \
     $(introspected_pub_headers) \
@@ -1534,12 +1514,6 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-if USE_X11
-introspection_files += \
-    gtksocket.c \
-    gtkplug.c
-endif
-
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_SCANNER_ENV = CC="$(CC)"
 INTROSPECTION_COMPILER_ARGS = \
@@ -1684,9 +1658,6 @@ EXTRA_DIST +=                   \
        libgtk3.manifest.in     \
        gtk-win32.rc.body.in    \
        gtk-win32.rc.body       \
-       gtkwin32embed.h         \
-       gtkwin32embedwidget.h   \
-       gtkwin32embedwidget.c   \
        gtkprint-win32.h        \
        gtkprint-win32.c        \
        gtksearchenginequartz.h \
diff --git a/gtk/a11y/gtkaccessibility.c b/gtk/a11y/gtkaccessibility.c
index 7f0e520..9fc1ed6 100644
--- a/gtk/a11y/gtkaccessibility.c
+++ b/gtk/a11y/gtkaccessibility.c
@@ -33,7 +33,6 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenubar.h>
-#include <gtk/gtksocket.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkaccessible.h>
 
@@ -254,17 +253,6 @@ gail_focus_watcher (GSignalInvocationHint *ihint,
         }
     }
 
-#ifdef GDK_WINDOWING_X11
-  /*
-   * If the focus widget is a GtkSocket without a plug
-   * then ignore the focus notification as the embedded
-   * plug will report a focus notification.
-   */
-  if (GTK_IS_SOCKET (widget) &&
-      gtk_socket_get_plug_window (GTK_SOCKET (widget)) != NULL)
-    return TRUE;
-#endif
-
   /*
    * The widget may not yet be visible on the screen so we wait until it is.
    */
diff --git a/gtk/a11y/gtktoplevelaccessible.c b/gtk/a11y/gtktoplevelaccessible.c
index 4daeab4..b925f30 100644
--- a/gtk/a11y/gtktoplevelaccessible.c
+++ b/gtk/a11y/gtktoplevelaccessible.c
@@ -26,7 +26,6 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkbutton.h>
-#include <gtk/gtkplug.h>
 #include <gtk/gtkwindow.h>
 
 #include "gtktoplevelaccessible.h"
@@ -208,9 +207,6 @@ show_event_watcher (GSignalInvocationHint *ihint,
   widget = GTK_WIDGET (object);
   if (gtk_widget_get_parent (widget) ||
       is_attached_menu_window (widget) ||
-#ifdef GDK_WINDOWING_X11
-      GTK_IS_PLUG (widget) ||
-#endif
       is_combo_window (widget))
     return TRUE;
 
@@ -270,9 +266,6 @@ gtk_toplevel_accessible_init (GtkToplevelAccessible *toplevel)
       if (!window ||
           !gtk_widget_get_visible (widget) ||
           is_attached_menu_window (widget) ||
-#ifdef GDK_WINDOWING_X11
-          GTK_IS_PLUG (window) ||
-#endif
           gtk_widget_get_parent (GTK_WIDGET (window)))
         {
           GList *temp_l  = l->next;
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index c9f34e2..10c0bd8 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -54,7 +54,6 @@
 #include "gtkimageprivate.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtkplug.h"
 #include "gtktooltipprivate.h"
 #include "gtkwindow.h"
 #include "gtkrender.h"
@@ -1067,18 +1066,7 @@ _gtk_drag_dest_handle_event (GtkWidget *toplevel,
 
         window = gtk_widget_get_window (toplevel);
 
-#ifdef GDK_WINDOWING_X11
-        /* Hackaround for: http://bugzilla.gnome.org/show_bug.cgi?id=136112
-         *
-         * Currently gdk_window_get_position doesn't provide reliable
-         * information for embedded windows, so we call the much more
-         * expensive gdk_window_get_origin().
-         */
-        if (GTK_IS_PLUG (toplevel))
-          gdk_window_get_origin (window, &tx, &ty);
-        else
-#endif /* GDK_WINDOWING_X11 */
-          gdk_window_get_position (window, &tx, &ty);
+        gdk_window_get_position (window, &tx, &ty);
 
         found = gtk_drag_find_widget (toplevel,
                                       context,
diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 7b78f73..d0fe541 100644
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -37,7 +37,7 @@
  * So....
  */
 #undef GTK_COMPILATION
-#include <gtk/gtkx.h>
+#include <gtk/gtk.h>
 #define GTK_COMPILATION
 
 /**
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f461146..932bea4 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -63,7 +63,6 @@
 #include "gtkmodifierstyle.h"
 #include "gtkversion.h"
 #include "gtkdebug.h"
-#include "gtkplug.h"
 #include "gtktypebuiltins.h"
 #include "a11y/gtkwidgetaccessible.h"
 #include "gtkapplicationprivate.h"
@@ -9120,9 +9119,8 @@ gtk_widget_get_has_window (GtkWidget *widget)
  *
  * Determines whether @widget is a toplevel widget.
  *
- * Currently only #GtkWindow and #GtkInvisible (and out-of-process
- * #GtkPlugs) are toplevel widgets. Toplevel widgets have no parent
- * widget.
+ * Currently only #GtkWindow and #GtkInvisible are toplevel widgets.
+ * Toplevel widgets have no parent widget.
  *
  * Returns: %TRUE if @widget is a toplevel, %FALSE otherwise
  *
@@ -10617,8 +10615,6 @@ gtk_widget_set_parent_window (GtkWidget *widget,
 
   if (parent_window != old_parent_window)
     {
-      gboolean is_plug;
-
       g_object_set_qdata (G_OBJECT (widget), quark_parent_window,
                          parent_window);
       if (old_parent_window)
@@ -10630,12 +10626,7 @@ gtk_widget_set_parent_window (GtkWidget *widget,
        * this is the primary entry point to allow toplevels to be
        * embeddable.
        */
-#ifdef GDK_WINDOWING_X11
-      is_plug = GTK_IS_PLUG (widget);
-#else
-      is_plug = FALSE;
-#endif
-      if (GTK_IS_WINDOW (widget) && !is_plug)
+      if (GTK_IS_WINDOW (widget))
        _gtk_window_set_is_toplevel (GTK_WINDOW (widget), parent_window == NULL);
     }
 }
@@ -11462,9 +11453,7 @@ gtk_widget_add_device_events (GtkWidget    *widget,
  * would return
  * %NULL if @widget wasn’t inside a toplevel window, and if the
  * window was inside a #GtkWindow-derived widget which was in turn
- * inside the toplevel #GtkWindow. While the second case may
- * seem unlikely, it actually happens when a #GtkPlug is embedded
- * inside a #GtkSocket within the same application.
+ * inside the toplevel #GtkWindow.
  *
  * To reliably find the toplevel #GtkWindow, use
  * gtk_widget_get_toplevel() and call gtk_widget_is_toplevel()
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index e77060d..600951b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -46,7 +46,6 @@
 #include "gtkmenushellprivate.h"
 #include "gtkicontheme.h"
 #include "gtkmarshalers.h"
-#include "gtkplug.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkwidgetprivate.h"
@@ -1712,17 +1711,10 @@ gtk_window_constructed (GObject *object)
 {
   GtkWindow *window = GTK_WINDOW (object);
   GtkWindowPrivate *priv = window->priv;
-  gboolean is_plug;
 
   G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
 
-#ifdef GDK_WINDOWING_X11
-  is_plug = GTK_IS_PLUG (window);
-#else
-  is_plug = FALSE;
-#endif
-
-  if (priv->type == GTK_WINDOW_TOPLEVEL && !is_plug)
+  if (priv->type == GTK_WINDOW_TOPLEVEL)
     {
       priv->multipress_gesture = gtk_gesture_multi_press_new (GTK_WIDGET (object));
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->multipress_gesture), 0);
@@ -5977,7 +5969,6 @@ gtk_window_show (GtkWidget *widget)
   GtkWindow *window = GTK_WINDOW (widget);
   GtkWindowPrivate *priv = window->priv;
   GtkContainer *container = GTK_CONTAINER (window);
-  gboolean is_plug;
 
   if (!_gtk_widget_is_toplevel (GTK_WIDGET (widget)))
     {
@@ -5995,15 +5986,7 @@ gtk_window_show (GtkWidget *widget)
 
   gtk_widget_map (widget);
 
-  /* Try to make sure that we have some focused widget
-   */
-#ifdef GDK_WINDOWING_X11
-  is_plug = GDK_IS_X11_WINDOW (_gtk_widget_get_window (widget)) &&
-    GTK_IS_PLUG (window);
-#else
-  is_plug = FALSE;
-#endif
-  if (!priv->focus_widget && !is_plug)
+  if (!priv->focus_widget)
     {
       if (priv->initial_focus)
         gtk_window_set_focus (window, priv->initial_focus);
@@ -10768,8 +10751,7 @@ _gtk_window_get_screen (GtkWindow *window)
  * 
  * Returns whether the window is part of the current active toplevel.
  * (That is, the toplevel window receiving keystrokes.)
- * The return value is %TRUE if the window is active toplevel
- * itself, but also if it is, say, a #GtkPlug embedded in the active toplevel.
+ * The return value is %TRUE if the window is active toplevel itself.
  * You might use this function if you wanted to draw a widget
  * differently in an active window from a widget in an inactive window.
  * See gtk_window_has_toplevel_focus()
diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 17ff80c..ad9934b 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -445,7 +445,6 @@ gtk_public_h_sources =              \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
-       gtkplug.h               \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h \
@@ -478,7 +477,6 @@ gtk_public_h_sources =              \
        gtkstacksidebar.h       \
        gtksizegroup.h          \
        gtksizerequest.h        \
-       gtksocket.h             \
        gtkspinbutton.h         \
        gtkspinner.h            \
        gtkstatusbar.h          \
diff --git a/po-properties/POTFILES.in b/po-properties/POTFILES.in
index b983e01..a4b84a9 100644
--- a/po-properties/POTFILES.in
+++ b/po-properties/POTFILES.in
@@ -216,7 +216,6 @@ gtk/gtkpathbar.c
 gtk/gtkplacessidebar.c
 gtk/gtkplacesview.c
 gtk/gtkplacesviewrow.c
-gtk/gtkplug.c
 gtk/gtkpopover.c
 gtk/gtkpopovermenu.c
 gtk/gtkprintbackend.c
@@ -259,7 +258,6 @@ gtk/gtkshortcutssection.c
 gtk/gtkshortcutsshortcut.c
 gtk/gtkshortcutswindow.c
 gtk/gtksizegroup.c
-gtk/gtksocket.c
 gtk/gtkspinbutton.c
 gtk/gtkspinner.c
 gtk/gtkstack.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6aa8a4e..9019554 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -217,7 +217,6 @@ gtk/gtkpathbar.c
 gtk/gtkplacessidebar.c
 gtk/gtkplacesview.c
 gtk/gtkplacesviewrow.c
-gtk/gtkplug.c
 gtk/gtkpopover.c
 gtk/gtkpopovermenu.c
 gtk/gtkprintbackend.c
@@ -261,7 +260,6 @@ gtk/gtkshortcutsshortcut.c
 gtk/gtkshortcutswindow.c
 gtk/gtksizegroup.c
 gtk/gtksizerequest.c
-gtk/gtksocket.c
 gtk/gtkspinbutton.c
 gtk/gtkspinner.c
 gtk/gtkstack.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 398ded8..2057389 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,10 +22,6 @@ LDADD = \
        -lm
 
 
-if USE_X11
-testsocket_programs = testsocket testsocket_child
-endif
-
 if OS_LINUX
 fontconfig_programs = testfontchooserdialog
 endif
@@ -113,7 +109,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testscale                       \
        testselection                   \
        testselectionmode               \
-       $(testsocket_programs)          \
        testspinbutton                  \
        teststockbuttonmenu             \
        testtoolbar                     \
@@ -246,8 +241,6 @@ testrecentchoosermenu_DEPENDENCIES = $(TEST_DEPS)
 testrichtext_DEPENDENCIES = $(TEST_DEPS)
 testscale_DEPENDENCIES = $(TEST_DEPS)
 testselection_DEPENDENCIES = $(TEST_DEPS)
-testsocket_DEPENDENCIES = $(DEPS)
-testsocket_child_DEPENDENCIES = $(DEPS)
 testspinbutton_DEPENDENCIES = $(TEST_DEPS)
 teststockbuttonmenu_DEPENDENCIES = $(TEST_DEPS)
 testtreechanging_DEPENDENCIES =        $(DEPS)
@@ -391,14 +384,6 @@ testprint_SOURCES =        \
        testprintfileoperation.h \
        testprintfileoperation.c
 
-testsocket_SOURCES =           \
-       testsocket.c            \
-       testsocket_common.c
-
-testsocket_child_SOURCES =     \
-       testsocket_child.c      \
-       testsocket_common.c
-
 testspinbutton_SOURCES =       \
        testspinbutton.c
 
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 4d297d4..8f45289 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -19,9 +19,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkunixprint.h>
-#ifdef GDK_WINDOWING_X11
-#include <gtk/gtkx.h>
-#endif
 #ifdef GDK_WINDOWING_WAYLAND
 #include "gdk/wayland/gdkwayland.h"
 #endif
@@ -416,14 +413,6 @@ test_type (gconstpointer data)
   if (g_type_is_a (type, GTK_TYPE_MOUNT_OPERATION))
     return;
 
-  /* Backend-specific */
-#ifdef GDK_WINDOWING_X11
-  if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) ;
-  else if (g_type_is_a (type, GTK_TYPE_PLUG) ||
-           g_type_is_a (type, GTK_TYPE_SOCKET))
-    return;
-#endif
-
   klass = g_type_class_ref (type);
 
   if (g_type_is_a (type, GTK_TYPE_SETTINGS))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]