diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-01-27 23:36:55 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-07 11:36:49 -0500 |
commit | e43376c53eeec7e05bec28e0b3ef542d79c454bd (patch) | |
tree | 9eee6685ccadb9e547ffa86c0a9d807d7b631913 | |
parent | 986352852a76d41a3c5323c0395a132562b9501d (diff) | |
download | gtk+-e43376c53eeec7e05bec28e0b3ef542d79c454bd.tar.gz |
Remove vestigial glade support
These files have not been kept up to date, and
glade doesn't work with GTK4 currently.
-rw-r--r-- | gtk/glade/README.glade | 17 | ||||
-rw-r--r-- | gtk/glade/gtk-private-widgets.xml | 33 | ||||
-rw-r--r-- | gtk/gtkgladecatalog.c | 56 | ||||
-rw-r--r-- | gtk/meson.build | 1 |
4 files changed, 0 insertions, 107 deletions
diff --git a/gtk/glade/README.glade b/gtk/glade/README.glade deleted file mode 100644 index 4790294a07..0000000000 --- a/gtk/glade/README.glade +++ /dev/null @@ -1,17 +0,0 @@ -The catalog in this directory defines some widgets that are private -to GTK and is needed to edit .ui files defining composite classes -in GTK. - -In order to edit any composite classes in GTK, startup Glade -in the following way, example: - - cd /path/to/gtk/ - GLADE_CATALOG_SEARCH_PATH=`pwd`/gtk/glade glade gtk/ui/gtkfilechooserwidget.ui - -Documentation for updating this catalog can be found here: - https://developer.gnome.org/gladeui/stable/ - -Note also that when including private GTK widgets as components, it is -important to call g_type_ensure () to register the type explicitly -before calling gtk_container_init_template(), otherwise GtkBuilder will -not be able to properly load the type. diff --git a/gtk/glade/gtk-private-widgets.xml b/gtk/glade/gtk-private-widgets.xml deleted file mode 100644 index 7e2ca72b81..0000000000 --- a/gtk/glade/gtk-private-widgets.xml +++ /dev/null @@ -1,33 +0,0 @@ -<glade-catalog name="gtkprivate" - version="3.96" - depends="gtk4" - library="gtk-4"> - <init-function>gtk_glade_catalog_init</init-function> - - <glade-widget-classes> - <!-- base GTK private widgets --> - <glade-widget-class name="GtkPathBar" generic-name="pathbar" title="Path Bar" icon-name="widget-gtk-toolbar"/> - <glade-widget-class name="GtkColorEditor" generic-name="coloreditor" title="Color Editor" icon-name="widget-gtk-colorselection"/> - <glade-widget-class name="GtkColorSwatch" generic-name="colorswatch" title="Color Swatch" icon-name="widget-gtk-colorselection"/> - <glade-widget-class name="GtkColorPlane" generic-name="colorplane" title="Color Plane" icon-name="widget-gtk-colorselection"/> - <glade-widget-class name="GtkColorScale" generic-name="colorscale" title="Color Scale" icon-name="widget-gtk-colorselection"/> - - <!-- gtkunixprint private widgets --> - <glade-widget-class name="GtkPrinterOptionWidget" generic-name="printeroptionwidget" title="Printer Option Widget" - icon-name="widget-gtk-frame"> - <properties> - <property id="orientation" default="GTK_ORIENTATION_HORIZONTAL"/> - <property id="size" disabled="True"/> - </properties> - </glade-widget-class> - </glade-widget-classes> - - <glade-widget-group name="gtk-private" title="Private GTK Classes"> - <glade-widget-class-ref name="GtkPathBar"/> - <glade-widget-class-ref name="GtkColorEditor"/> - <glade-widget-class-ref name="GtkColorSwatch"/> - <glade-widget-class-ref name="GtkColorPlane"/> - <glade-widget-class-ref name="GtkColorScale"/> - <glade-widget-class-ref name="GtkPrinterOptionWidget"/> - </glade-widget-group> -</glade-catalog> diff --git a/gtk/gtkgladecatalog.c b/gtk/gtkgladecatalog.c deleted file mode 100644 index a44a120767..0000000000 --- a/gtk/gtkgladecatalog.c +++ /dev/null @@ -1,56 +0,0 @@ -/* gtkgladecatalog.c - * - * Copyright (C) 2013 Openismus GmbH - * - * Authors: - * Tristan Van Berkom <tristanvb@openismus.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - - -#include "config.h" - -#include "gtkpathbar.h" -#include "gtkplacesviewprivate.h" -#include "gtkcolorswatchprivate.h" -#include "gtkcolorplaneprivate.h" -#include "gtkcolorscaleprivate.h" -#include "gtkcoloreditorprivate.h" - -#ifdef G_OS_UNIX -# include "gtkprinteroptionwidget.h" -#endif - -_GDK_EXTERN -void gtk_glade_catalog_init (const char *catalog_name); - -/* This function is referred to in gtk/glade/gtk-private-widgets.xml - * and is used to ensure the private types for use in Glade while - * editing UI files that define GTK’s various composite widget classes. - */ -void -gtk_glade_catalog_init (const char *catalog_name) -{ - g_type_ensure (GTK_TYPE_PATH_BAR); - g_type_ensure (GTK_TYPE_PLACES_VIEW); - g_type_ensure (GTK_TYPE_COLOR_SWATCH); - g_type_ensure (GTK_TYPE_COLOR_PLANE); - g_type_ensure (GTK_TYPE_COLOR_SCALE); - g_type_ensure (GTK_TYPE_COLOR_EDITOR); - -#ifdef G_OS_UNIX - g_type_ensure (GTK_TYPE_PRINTER_OPTION_WIDGET); -#endif -} diff --git a/gtk/meson.build b/gtk/meson.build index f1fd696297..3d46552a40 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -110,7 +110,6 @@ gtk_private_sources = files([ 'gtkfilechooserutils.c', 'gtkfilesystemmodel.c', 'gtkgizmo.c', - 'gtkgladecatalog.c', 'gtkhsla.c', 'gtkiconcache.c', 'tools/gtkiconcachevalidator.c', |