diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-19 16:41:14 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-19 16:41:14 +0000 |
| commit | 3e319b409bf4756e794585e07c09c0d17ab73b06 (patch) | |
| tree | 86115f9d13608fca916d6ba195f832c3f45a2437 | |
| parent | 0c6a6b3370aebf0a2d76b145ff43ed62bc642fcc (diff) | |
| parent | f2b16836c25c9a12be1405d22c1a3a4e11a4d2be (diff) | |
| download | gtk+-3e319b409bf4756e794585e07c09c0d17ab73b06.tar.gz | |
Merge branch 'ebassi/issue-3492' into 'master'
3to4: Remove GtkCheckButton:draw-indicator
Closes #3492
See merge request GNOME/gtk!2976
| -rw-r--r-- | gtk/tools/gtk-builder-tool-simplify.c | 1 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/checkbutton.expected | 17 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/checkbutton.ui | 19 |
3 files changed, 37 insertions, 0 deletions
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c index add00fe833..151488f272 100644 --- a/gtk/tools/gtk-builder-tool-simplify.c +++ b/gtk/tools/gtk-builder-tool-simplify.c @@ -660,6 +660,7 @@ property_has_been_removed (Element *element, { "GtkBox", "pack-type", PROP_KIND_PACKING }, { "GtkHeaderBar", "position", PROP_KIND_PACKING }, { "GtkPopoverMenu", "position",PROP_KIND_PACKING }, + { "GtkCheckButton", "draw-indicator", PROP_KIND_OBJECT }, }; char *canonical_name; gboolean found; diff --git a/testsuite/tools/simplify-data-3to4/checkbutton.expected b/testsuite/tools/simplify-data-3to4/checkbutton.expected new file mode 100644 index 0000000000..63b5655f7e --- /dev/null +++ b/testsuite/tools/simplify-data-3to4/checkbutton.expected @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk" version="4.0"/> + <object class="GtkWindow" id="window1"> + <property name="child"> + <object class="GtkBox" id="box1"> + <property name="orientation">GTK_ORIENTATION_VERTICAL</property> + <child> + <object class="GtkCheckButton" id="checkbutton1"> + <property name="hexpand">1</property> + <property name="label">Check</property> + </object> + </child> + </object> + </property> + </object> +</interface> diff --git a/testsuite/tools/simplify-data-3to4/checkbutton.ui b/testsuite/tools/simplify-data-3to4/checkbutton.ui new file mode 100644 index 0000000000..33e2cf904c --- /dev/null +++ b/testsuite/tools/simplify-data-3to4/checkbutton.ui @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <object class="GtkWindow" id="window1"> + <child> + <object class="GtkBox" id="box1"> + <property name="orientation">GTK_ORIENTATION_VERTICAL</property> + <property name="visible">1</property> + <child> + <object class="GtkCheckButton" id="checkbutton1"> + <property name="draw_indicator">1</property> + <property name="hexpand">1</property> + <property name="label">Check</property> + <property name="visible">1</property> + </object> + </child> + </object> + </child> + </object> +</interface> |