diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index d798189773..3b178a5d13 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -4711,16 +4711,6 @@ gtk_style_provider_get_type gtkstylecontext GtkStyleContext -GTK_STYLE_PROPERTY_BACKGROUND_COLOR -GTK_STYLE_PROPERTY_COLOR -GTK_STYLE_PROPERTY_FONT -GTK_STYLE_PROPERTY_MARGIN -GTK_STYLE_PROPERTY_PADDING -GTK_STYLE_PROPERTY_BORDER_WIDTH -GTK_STYLE_PROPERTY_BORDER_RADIUS -GTK_STYLE_PROPERTY_BORDER_STYLE -GTK_STYLE_PROPERTY_BORDER_COLOR -GTK_STYLE_PROPERTY_BACKGROUND_IMAGE GtkBorderStyle GTK_STYLE_CLASS_ACCELERATOR diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 66544ccab6..45f73fc007 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -57,92 +57,6 @@ struct _GtkStyleContextClass void (*_gtk_reserved4) (void); }; -/* Default set of properties that GtkStyleContext may contain */ - -/** - * GTK_STYLE_PROPERTY_BACKGROUND_COLOR: - * - * A property holding the background color of rendered elements as a #GdkRGBA. - */ -#define GTK_STYLE_PROPERTY_BACKGROUND_COLOR "background-color" - -/** - * GTK_STYLE_PROPERTY_COLOR: - * - * A property holding the foreground color of rendered elements as a #GdkRGBA. - */ -#define GTK_STYLE_PROPERTY_COLOR "color" - -/** - * GTK_STYLE_PROPERTY_FONT: - * - * A property holding the font properties used when rendering text - * as a #PangoFontDescription. - */ -#define GTK_STYLE_PROPERTY_FONT "font" - -/** - * GTK_STYLE_PROPERTY_PADDING: - * - * A property holding the rendered element’s padding as a #GtkBorder. The - * padding is defined as the spacing between the inner part of the element border - * and its child. It’s the innermost spacing property of the padding/border/margin - * series. - */ -#define GTK_STYLE_PROPERTY_PADDING "padding" - -/** - * GTK_STYLE_PROPERTY_BORDER_WIDTH: - * - * A property holding the rendered element’s border width in pixels as - * a #GtkBorder. The border is the intermediary spacing property of the - * padding/border/margin series. - * - * gtk_render_frame() uses this property to find out the frame line width, - * so #GtkWidgets rendering frames may need to add up this padding when - * requesting size - */ -#define GTK_STYLE_PROPERTY_BORDER_WIDTH "border-width" - -/** - * GTK_STYLE_PROPERTY_MARGIN: - * - * A property holding the rendered element’s margin as a #GtkBorder. The - * margin is defined as the spacing between the border of the element - * and its surrounding elements. It is external to #GtkWidget's - * size allocations, and the most external spacing property of the - * padding/border/margin series. - */ -#define GTK_STYLE_PROPERTY_MARGIN "margin" - -/** - * GTK_STYLE_PROPERTY_BORDER_RADIUS: - * - * A property holding the rendered element’s border radius in pixels as a #gint. - */ -#define GTK_STYLE_PROPERTY_BORDER_RADIUS "border-radius" - -/** - * GTK_STYLE_PROPERTY_BORDER_STYLE: - * - * A property holding the element’s border style as a #GtkBorderStyle. - */ -#define GTK_STYLE_PROPERTY_BORDER_STYLE "border-style" - -/** - * GTK_STYLE_PROPERTY_BORDER_COLOR: - * - * A property holding the element’s border color as a #GdkRGBA. - */ -#define GTK_STYLE_PROPERTY_BORDER_COLOR "border-color" - -/** - * GTK_STYLE_PROPERTY_BACKGROUND_IMAGE: - * - * A property holding the element’s background as a #cairo_pattern_t. - */ -#define GTK_STYLE_PROPERTY_BACKGROUND_IMAGE "background-image" - /* Predefined set of CSS classes */ /** diff --git a/tests/testcalendar.c b/tests/testcalendar.c index 545e89aac0..f810063d85 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -495,7 +495,7 @@ create_calendar(void) size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); context = gtk_widget_get_style_context (calendar); - gtk_style_context_get (context, GTK_STYLE_PROPERTY_FONT, &font_desc, NULL); + gtk_style_context_get (context, "font", &font_desc, NULL); font = pango_font_description_to_string (font_desc); button = gtk_font_button_new_with_font (font); g_free (font);