clutter: Remove deprecated BoxLayout pack-start property

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3103>
This commit is contained in:
Bilal Elmoussaoui 2023-06-29 09:54:45 +02:00 committed by Bilal Elmoussaoui
parent 8d038789f6
commit 185058456f
5 changed files with 1 additions and 100 deletions

View File

@ -51,7 +51,6 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-box-layout.h"
#include "deprecated/clutter-container.h" #include "deprecated/clutter-container.h"
#include "clutter-box-layout.h" #include "clutter-box-layout.h"
@ -83,7 +82,6 @@ enum
PROP_SPACING, PROP_SPACING,
PROP_HOMOGENEOUS, PROP_HOMOGENEOUS,
PROP_PACK_START,
PROP_ORIENTATION, PROP_ORIENTATION,
PROP_LAST PROP_LAST
@ -878,10 +876,6 @@ clutter_box_layout_set_property (GObject *gobject,
clutter_box_layout_set_spacing (self, g_value_get_uint (value)); clutter_box_layout_set_spacing (self, g_value_get_uint (value));
break; break;
case PROP_PACK_START:
clutter_box_layout_set_pack_start (self, g_value_get_boolean (value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -910,10 +904,6 @@ clutter_box_layout_get_property (GObject *gobject,
g_value_set_uint (value, priv->spacing); g_value_set_uint (value, priv->spacing);
break; break;
case PROP_PACK_START:
g_value_set_boolean (value, FALSE);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
break; break;
@ -957,16 +947,6 @@ clutter_box_layout_class_init (ClutterBoxLayoutClass *klass)
FALSE, FALSE,
CLUTTER_PARAM_READWRITE); CLUTTER_PARAM_READWRITE);
/**
* ClutterBoxLayout:pack-start:
*
* Deprecated: No longer has any effect
*/
obj_props[PROP_PACK_START] =
g_param_spec_boolean ("pack-start", NULL, NULL,
FALSE,
CLUTTER_PARAM_READWRITE | G_PARAM_DEPRECATED);
/** /**
* ClutterBoxLayout:spacing: * ClutterBoxLayout:spacing:
* *
@ -1151,31 +1131,3 @@ clutter_box_layout_get_homogeneous (ClutterBoxLayout *layout)
return layout->priv->is_homogeneous; return layout->priv->is_homogeneous;
} }
/**
* clutter_box_layout_set_pack_start:
* @layout: a #ClutterBoxLayout
* @pack_start: %TRUE if the @layout should pack children at the
* beginning of the layout
*
* Deprecated: No longer has any effect
*/
void
clutter_box_layout_set_pack_start (ClutterBoxLayout *layout,
gboolean pack_start)
{
}
/**
* clutter_box_layout_get_pack_start:
* @layout: a #ClutterBoxLayout
*
* Return value: The value of the :pack-start property,
* always %FALSE
*
* Deprecated: No longer has any effect
*/
gboolean
clutter_box_layout_get_pack_start (ClutterBoxLayout *layout)
{
return FALSE;
}

View File

@ -3,7 +3,6 @@
#define __CLUTTER_DEPRECATED_H_INSIDE__ #define __CLUTTER_DEPRECATED_H_INSIDE__
#include "deprecated/clutter-box-layout.h"
#include "deprecated/clutter-container.h" #include "deprecated/clutter-container.h"
#undef __CLUTTER_DEPRECATED_H_INSIDE__ #undef __CLUTTER_DEPRECATED_H_INSIDE__

View File

@ -1,48 +0,0 @@
/*
* Clutter.
*
* An OpenGL based 'interactive canvas' library.
*
* Copyright (C) 2009 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
*
* Based on the NBTK NbtkBoxLayout actor by:
* Thomas Wood <thomas.wood@intel.com>
*/
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BOX_LAYOUT_DEPRECATED_H__
#define __CLUTTER_BOX_LAYOUT_DEPRECATED_H__
#include <clutter/clutter-box-layout.h>
G_BEGIN_DECLS
CLUTTER_DEPRECATED
void clutter_box_layout_set_pack_start (ClutterBoxLayout *layout,
gboolean pack_start);
CLUTTER_DEPRECATED
gboolean clutter_box_layout_get_pack_start (ClutterBoxLayout *layout);
G_END_DECLS
#endif /* __CLUTTER_BOX_LAYOUT_DEPRECATED_H__ */

View File

@ -232,7 +232,6 @@ clutter_nonintrospected_sources = [
] ]
clutter_deprecated_headers = [ clutter_deprecated_headers = [
'deprecated/clutter-box-layout.h',
'deprecated/clutter-container.h', 'deprecated/clutter-container.h',
'deprecated/clutter-timeline.h', 'deprecated/clutter-timeline.h',
] ]

View File

@ -3,8 +3,7 @@
"id" : "layout", "id" : "layout",
"type" : "ClutterBoxLayout", "type" : "ClutterBoxLayout",
"orientation" : "vertical", "orientation" : "vertical",
"spacing" : 12, "spacing" : 12
"pack-start" : false
}, },
{ {
"type" : "ClutterStage", "type" : "ClutterStage",