[gtk/drop-multi-selection] Drop GtkMultiSelection



commit c77c9f3492df870cc7b019182614f93e8ab40521
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jun 18 15:58:03 2020 -0400

    Drop GtkMultiSelection
    
    GtkPropertySelection is a better approach to solving
    the same use cases, so just drop this.

 docs/reference/gtk/gtk4-docs.xml     |   3 +-
 docs/reference/gtk/gtk4-sections.txt |   9 -
 docs/reference/gtk/gtk4.types.in     |   1 -
 gtk/gtk.h                            |   1 -
 gtk/gtklistbase.c                    |   1 -
 gtk/gtkmultiselection.c              | 411 ---------------------------
 gtk/gtkmultiselection.h              |  39 ---
 gtk/meson.build                      |   2 -
 testsuite/gtk/defaultvalue.c         |   6 +-
 testsuite/gtk/meson.build            |   1 -
 testsuite/gtk/multiselection.c       | 534 -----------------------------------
 testsuite/gtk/notify.c               |   3 +-
 testsuite/gtk/objects-finalize.c     |   3 +-
 13 files changed, 5 insertions(+), 1009 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index c0ad7bf691..e104986ab5 100644
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -71,8 +71,7 @@
       <section>
         <xi:include href="xml/gtknoselection.xml" />
         <xi:include href="xml/gtksingleselection.xml" />
-        <xi:include href="xml/gtkmultiselection.xml" />
-      <xi:include href="xml/gtkpropertyselection.xml" />
+        <xi:include href="xml/gtkpropertyselection.xml" />
       </section>
       <xi:include href="xml/gtkdirectorylist.xml" />
       <xi:include href="xml/gtkbookmarklist.xml" />
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 31d229bb36..6a5c02b943 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -395,15 +395,6 @@ gtk_single_selection_set_can_unselect
 gtk_single_selection_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkmultiselection</FILE>
-<TITLE>GtkMultiSeledction</TITLE>
-GtkMultiSelection
-gtk_multi_selection_new
-<SUBSECTION Private>
-gtk_multi_selection_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkpropertyselection</FILE>
 <TITLE>GtkPropertySelection</TITLE>
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index 332bb508d7..c6ce827e5c 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -141,7 +141,6 @@ gtk_menu_button_get_type
 gtk_message_dialog_get_type
 gtk_mount_operation_get_type
 gtk_multi_filter_get_type
-gtk_multi_selection_get_type
 gtk_multi_sorter_get_type
 gtk_native_get_type
 gtk_native_dialog_get_type
diff --git a/gtk/gtk.h b/gtk/gtk.h
index b7600866f9..88aef8fbda 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -176,7 +176,6 @@
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkmountoperation.h>
 #include <gtk/gtkmultifilter.h>
-#include <gtk/gtkmultiselection.h>
 #include <gtk/gtkmultisorter.h>
 #include <gtk/gtknative.h>
 #include <gtk/gtknativedialog.h>
diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index 507e3c81fd..0cbeddc075 100644
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -26,7 +26,6 @@
 #include "gtkgizmoprivate.h"
 #include "gtkintl.h"
 #include "gtklistitemwidgetprivate.h"
-#include "gtkmultiselection.h"
 #include "gtkorientable.h"
 #include "gtkscrollable.h"
 #include "gtkset.h"
diff --git a/gtk/meson.build b/gtk/meson.build
index 83048902a7..63e4d21c96 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -304,7 +304,6 @@ gtk_public_sources = files([
   'gtkmodules.c',
   'gtkmountoperation.c',
   'gtkmultifilter.c',
-  'gtkmultiselection.c',
   'gtkmultisorter.c',
   'gtknativedialog.c',
   'gtknomediafile.c',
@@ -581,7 +580,6 @@ gtk_public_headers = files([
   'gtkmessagedialog.h',
   'gtkmountoperation.h',
   'gtkmultifilter.h',
-  'gtkmultiselection.h',
   'gtkmultisorter.h',
   'gtknative.h',
   'gtknativedialog.h',
diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c
index 15c9047a93..9aad809c00 100644
--- a/testsuite/gtk/defaultvalue.c
+++ b/testsuite/gtk/defaultvalue.c
@@ -117,8 +117,7 @@ test_type (gconstpointer data)
     }
   else if (g_type_is_a (type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (type, GTK_TYPE_NO_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_MULTI_SELECTION))
+           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION))
     {
       GListStore *list_store = g_list_store_new (G_TYPE_OBJECT);
       instance = g_object_new (type,
@@ -281,8 +280,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
       if ((g_type_is_a (type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (type, GTK_TYPE_NO_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_MULTI_SELECTION)) &&
+           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION)) &&
           strcmp (pspec->name, "model") == 0)
         continue;
 
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 5946f7cfda..bde51f36e4 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -39,7 +39,6 @@ tests = [
   ['listbox'],
   ['main'],
   ['maplistmodel'],
-  ['multiselection'],
   ['notify'],
   ['no-gtk-init'],
   ['object'],
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 209685ed38..61030aed2c 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -461,8 +461,7 @@ test_type (gconstpointer data)
     }
   else if (g_type_is_a (type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (type, GTK_TYPE_NO_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION) ||
-           g_type_is_a (type, GTK_TYPE_MULTI_SELECTION))
+           g_type_is_a (type, GTK_TYPE_SINGLE_SELECTION))
     {
       GListStore *list_store = g_list_store_new (G_TYPE_OBJECT);
       instance = g_object_new (type,
diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index bd26c83c23..c671025b38 100644
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -71,8 +71,7 @@ test_finalize_object (gconstpointer data)
     }
   else if (g_type_is_a (test_type, GTK_TYPE_FILTER_LIST_MODEL) ||
            g_type_is_a (test_type, GTK_TYPE_NO_SELECTION) ||
-           g_type_is_a (test_type, GTK_TYPE_SINGLE_SELECTION) ||
-           g_type_is_a (test_type, GTK_TYPE_MULTI_SELECTION))
+           g_type_is_a (test_type, GTK_TYPE_SINGLE_SELECTION))
     {
       GListStore *list_store = g_list_store_new (G_TYPE_OBJECT);
       object = g_object_new (test_type,


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