From 43f822e70fbdf4ffeb2354a65c801c77877e01d2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 Nov 2015 15:13:33 -0500 Subject: [PATCH] Annotate deprecated style properties Use G_PARAM_DEPRECATED with deprecated style properties. This will make it easier to identify and remove such stale properties from css, since it will now trigger warnings. --- gtk/gtkassistant.c | 4 ++-- gtk/gtkbutton.c | 2 +- gtk/gtkentry.c | 2 +- gtk/gtkiconview.c | 4 ++-- gtk/gtkinfobar.c | 8 ++++---- gtk/gtkmenubar.c | 4 ++-- gtk/gtkmenuitem.c | 2 +- gtk/gtkprogressbar.c | 4 ++-- gtk/gtkrange.c | 4 ++-- gtk/gtkspinbutton.c | 2 +- gtk/gtktoolbar.c | 4 ++-- gtk/gtktoolbutton.c | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index a2e009e27d..2945d534ee 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -543,7 +543,7 @@ gtk_assistant_class_init (GtkAssistantClass *class) 0, G_MAXINT, 6, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE | G_PARAM_DEPRECATED)); /** * GtkAssistant:content-padding: @@ -559,7 +559,7 @@ gtk_assistant_class_init (GtkAssistantClass *class) 0, G_MAXINT, 1, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE | G_PARAM_DEPRECATED)); /** * GtkAssistant:page-type: diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 3c22455099..315a11bb1d 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -605,7 +605,7 @@ gtk_button_class_init (GtkButtonClass *klass) 0, G_MAXINT, 2, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE | G_PARAM_DEPRECATED)); gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BUTTON_ACCESSIBLE); gtk_widget_class_set_css_name (widget_class, "button"); diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 710962dee8..91ac223c59 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1505,7 +1505,7 @@ gtk_entry_class_init (GtkEntryClass *class) P_("Icon Prelight"), P_("Whether activatable icons should prelight when hovered"), TRUE, - GTK_PARAM_READABLE|G_PARAM_EXPLICIT_NOTIFY)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkEntry:progress-border: diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 019ab0ec28..e134053ed5 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -687,7 +687,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) P_("Selection Box Color"), P_("Color of the selection box"), g_type_from_name ("GdkColor"), - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** @@ -704,7 +704,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) P_("Opacity of the selection box"), 0, 0xff, 0x40, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /* Signals */ /** diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 919b95cdfa..5b11ba7c7c 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -526,7 +526,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) 0, G_MAXINT, CONTENT_AREA_DEFAULT_BORDER, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkInfoBar:content-area-spacing: @@ -544,7 +544,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) 0, G_MAXINT, CONTENT_AREA_DEFAULT_SPACING, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkInfoBar:button-spacing: @@ -561,7 +561,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) 0, G_MAXINT, ACTION_AREA_DEFAULT_SPACING, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkInfoBar:action-area-border: @@ -578,7 +578,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) 0, G_MAXINT, ACTION_AREA_DEFAULT_BORDER, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); binding_set = gtk_binding_set_by_class (klass); diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 5155783c11..a385504fe3 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -226,7 +226,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) P_("Style of bevel around the menubar"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_OUT, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkMenuBar:internal-padding: @@ -245,7 +245,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class) G_MAXINT, 0, GTK_PARAM_READABLE | - G_PARAM_DEPRECATED)); + G_PARAM_DEPRECATED|G_PARAM_DEPRECATED)); gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR); gtk_widget_class_set_css_name (widget_class, "menubar"); diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index edd996489c..b36bc1b048 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -500,7 +500,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) "Shadow type when item is selected", GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_NONE, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkMenuItem:horizontal-padding: diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index ee8a07a30d..2b325e1b6e 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -270,7 +270,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class) P_("X spacing"), P_("Extra spacing applied to the width of a progress bar."), 0, G_MAXINT, 2, - G_PARAM_READWRITE)); + G_PARAM_READWRITE|G_PARAM_DEPRECATED)); /** * GtkProgressBar:yspacing: @@ -285,7 +285,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class) P_("Y spacing"), P_("Extra spacing applied to the height of a progress bar."), 0, G_MAXINT, 2, - G_PARAM_READWRITE)); + G_PARAM_READWRITE|G_PARAM_DEPRECATED)); /** * GtkProgressBar:min-horizontal-bar-width: diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 4f879d1f20..ccc0a3fd18 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -585,7 +585,7 @@ gtk_range_class_init (GtkRangeClass *class) G_MININT, G_MAXINT, 0, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkRange:arrow-displacement-y: @@ -601,7 +601,7 @@ gtk_range_class_init (GtkRangeClass *class) G_MININT, G_MAXINT, 0, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkRange:trough-under-steppers: diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index d698a2940e..a36a9892aa 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -447,7 +447,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) P_("Style of bevel around the spin button"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_IN, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); /** * GtkSpinButton::input: diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index ccf7a48004..7900857c89 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -593,7 +593,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) 0, G_MAXINT, 0, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); gtk_widget_class_install_style_property (widget_class, g_param_spec_int ("max-child-expand", @@ -634,7 +634,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) P_("Style of bevel around the toolbar"), GTK_TYPE_SHADOW_TYPE, GTK_SHADOW_OUT, - GTK_PARAM_READABLE)); + GTK_PARAM_READABLE|G_PARAM_DEPRECATED)); binding_set = gtk_binding_set_by_class (klass); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index cf1d2a32a3..eadb362cd7 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -313,7 +313,7 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass) 0, G_MAXINT, 3, - GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY)); + GTK_PARAM_READWRITE)); /** * GtkToolButton::clicked: