Commit 269d89c7 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Define macros GTK_PARAM_READABLE, GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE

2005-03-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprivate.h: Define macros GTK_PARAM_READABLE,
	GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE which are like
	their G_ counterparts, but also mark the name, nick
	and blurb as static.

	* gtk/*.c: Mark param spec strings as static, using
	the new macros.
parent 8d752a55
2005-03-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprivate.h: Define macros GTK_PARAM_READABLE,
GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE which are like
their G_ counterparts, but also mark the name, nick
and blurb as static.
* gtk/*.c: Mark param spec strings as static, using
the new macros.
* gtk/gtkspinbutton.h: Fix a typo.
2005-03-21 Matthias Clasen <mclasen@redhat.com>
......
2005-03-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprivate.h: Define macros GTK_PARAM_READABLE,
GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE which are like
their G_ counterparts, but also mark the name, nick
and blurb as static.
* gtk/*.c: Mark param spec strings as static, using
the new macros.
* gtk/gtkspinbutton.h: Fix a typo.
2005-03-21 Matthias Clasen <mclasen@redhat.com>
......
2005-03-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprivate.h: Define macros GTK_PARAM_READABLE,
GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE which are like
their G_ counterparts, but also mark the name, nick
and blurb as static.
* gtk/*.c: Mark param spec strings as static, using
the new macros.
* gtk/gtkspinbutton.h: Fix a typo.
2005-03-21 Matthias Clasen <mclasen@redhat.com>
......
......@@ -47,6 +47,7 @@
#include "gtkvbox.h"
#include "gtkviewport.h"
#include "gtkiconfactory.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -189,8 +190,6 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
widget_class->style_set = gtk_about_dialog_style_set;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
/**
* GtkAboutDialog:name:
*
......@@ -205,7 +204,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Program name"),
P_("The name of the program. If this is not set, it defaults to g_get_application_name()"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:version:
......@@ -220,7 +219,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Program version"),
P_("The version of the program"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:copyright:
......@@ -235,7 +234,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Copyright string"),
P_("Copyright information for the program"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
......@@ -253,7 +252,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Comments string"),
P_("Comments about the program"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:license:
......@@ -271,7 +270,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
_("License"),
_("The license of the program"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:website:
......@@ -287,7 +286,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Website URL"),
P_("The URL for the link to the website of the program"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:website-label:
......@@ -304,7 +303,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Website label"),
P_("The label for the link to the website of the program. If this is not set, it defaults to the URL"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:authors:
......@@ -321,7 +320,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Authors"),
P_("List of authors of the program"),
G_TYPE_STRV,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:documenters:
......@@ -338,7 +337,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Documenters"),
P_("List of people documenting the program"),
G_TYPE_STRV,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:artists:
......@@ -355,7 +354,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Artists"),
P_("List of people who have contributed artwork to the program"),
G_TYPE_STRV,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
......@@ -373,7 +372,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Translator credits"),
P_("Credits to the translators. This string should be marked as translatable"),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:logo:
......@@ -389,7 +388,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Logo"),
P_("A logo for the about box. If this is not set, it defaults to gtk_window_get_default_icon_list()"),
GDK_TYPE_PIXBUF,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAboutDialog:logo-icon-name:
......@@ -405,7 +404,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Logo Icon Name"),
P_("A named icon to use as the logo for the about box."),
NULL,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
/* Style properties */
gtk_widget_class_install_style_property (widget_class,
......@@ -413,7 +412,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
P_("Link Color"),
P_("Color of hyperlinks"),
GDK_TYPE_COLOR,
G_PARAM_READABLE|STATIC_STRINGS));
GTK_PARAM_READABLE));
g_type_class_add_private (object_class, sizeof (GtkAboutDialogPrivate));
}
......
......@@ -33,6 +33,7 @@
#include "gtkaccellabel.h"
#include "gtkaccelmap.h"
#include "gtkmain.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -133,22 +134,20 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
class->accel_seperator = g_strdup (" / ");
class->latin1_to_char = TRUE;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_ACCEL_CLOSURE,
g_param_spec_boxed ("accel-closure",
P_("Accelerator Closure"),
P_("The closure to be monitored for accelerator changes"),
G_TYPE_CLOSURE,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_ACCEL_WIDGET,
g_param_spec_object ("accel-widget",
P_("Accelerator Widget"),
P_("The widget to be monitored for accelerator changes"),
GTK_TYPE_WIDGET,
G_PARAM_READWRITE|STATIC_STRINGS));
GTK_PARAM_READWRITE));
}
static void
......
......@@ -44,6 +44,7 @@
#include "gtktearoffmenuitem.h"
#include "gtktoolbutton.h"
#include "gtktoolbar.h"
#include "gtkprivate.h"
#include "gtkalias.h"
......@@ -190,16 +191,14 @@ gtk_action_class_init (GtkActionClass *klass)
klass->menu_item_type = GTK_TYPE_IMAGE_MENU_ITEM;
klass->toolbar_item_type = GTK_TYPE_TOOL_BUTTON;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_NAME,
g_param_spec_string ("name",
P_("Name"),
P_("A unique name for the action."),
NULL,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | STATIC_STRINGS));
GTK_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class,
PROP_LABEL,
g_param_spec_string ("label",
......@@ -207,21 +206,21 @@ gtk_action_class_init (GtkActionClass *klass)
P_("The label used for menu items and buttons "
"that activate this action."),
NULL,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHORT_LABEL,
g_param_spec_string ("short-label",
P_("Short label"),
P_("A shorter label that may be used on toolbar buttons."),
NULL,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_TOOLTIP,
g_param_spec_string ("tooltip",
P_("Tooltip"),
P_("A tooltip for this action."),
NULL,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_STOCK_ID,
g_param_spec_string ("stock-id",
......@@ -229,7 +228,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("The stock icon displayed in widgets representing "
"this action."),
NULL,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE_HORIZONTAL,
g_param_spec_boolean ("visible-horizontal",
......@@ -237,7 +236,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Whether the toolbar item is visible when the toolbar "
"is in a horizontal orientation."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAction:visible-overflown:
*
......@@ -253,7 +252,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("When TRUE, toolitem proxies for this action "
"are represented in the toolbar overflow menu."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE_VERTICAL,
g_param_spec_boolean ("visible-vertical",
......@@ -261,7 +260,7 @@ gtk_action_class_init (GtkActionClass *klass)
P_("Whether the toolbar item is visible when the toolbar "
"is in a vertical orientation."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_IS_IMPORTANT,
g_param_spec_boolean ("is-important",
......@@ -270,35 +269,35 @@ gtk_action_class_init (GtkActionClass *klass)
"When TRUE, toolitem proxies for this action "
"show text in GTK_TOOLBAR_BOTH_HORIZ mode."),
FALSE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HIDE_IF_EMPTY,
g_param_spec_boolean ("hide-if-empty",
P_("Hide if empty"),
P_("When TRUE, empty menu proxies for this action are hidden."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SENSITIVE,
g_param_spec_boolean ("sensitive",
P_("Sensitive"),
P_("Whether the action is enabled."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE,
g_param_spec_boolean ("visible",
P_("Visible"),
P_("Whether the action is visible."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_ACTION_GROUP,
g_param_spec_object ("action-group",
P_("Action Group"),
P_("The GtkActionGroup this GtkAction is associated with, or NULL (for internal use)."),
GTK_TYPE_ACTION_GROUP,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAction::activate:
......
......@@ -36,6 +36,7 @@
#include "gtkradioaction.h"
#include "gtkaccelmap.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -128,30 +129,27 @@ gtk_action_group_class_init (GtkActionGroupClass *klass)
gobject_class->get_property = gtk_action_group_get_property;
klass->get_action = gtk_action_group_real_get_action;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_NAME,
g_param_spec_string ("name",
P_("Name"),
P_("A name for the action group."),
NULL,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY | STATIC_STRINGS));
GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (gobject_class,
PROP_SENSITIVE,
g_param_spec_boolean ("sensitive",
P_("Sensitive"),
P_("Whether the action group is enabled."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_VISIBLE,
g_param_spec_boolean ("visible",
P_("Visible"),
P_("Whether the action group is visible."),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkActionGroup::connect-proxy:
......
......@@ -26,8 +26,9 @@
#include <config.h>
#include "gtkadjustment.h"
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
enum
......@@ -102,8 +103,6 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
class->changed = NULL;
class->value_changed = NULL;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
/**
* GtkAdjustment:value:
*
......@@ -119,7 +118,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAdjustment:lower:
......@@ -136,7 +135,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAdjustment:upper:
......@@ -156,7 +155,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAdjustment:step-increment:
......@@ -173,7 +172,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAdjustment:page-increment:
......@@ -190,7 +189,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAdjustment:page-size:
......@@ -210,7 +209,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
-G_MAXDOUBLE,
G_MAXDOUBLE,
0.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
adjustment_signals[CHANGED] =
......
......@@ -26,6 +26,7 @@
#include <config.h>
#include "gtkalignment.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -112,8 +113,6 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
widget_class->size_request = gtk_alignment_size_request;
widget_class->size_allocate = gtk_alignment_size_allocate;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_XALIGN,
g_param_spec_float("xalign",
......@@ -122,7 +121,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
0.5,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YALIGN,
......@@ -132,7 +131,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
0.5,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_XSCALE,
g_param_spec_float("xscale",
......@@ -141,7 +140,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
1.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YSCALE,
g_param_spec_float("yscale",
......@@ -150,7 +149,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0.0,
1.0,
1.0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
......@@ -168,7 +167,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAlignment:bottom-padding:
......@@ -185,7 +184,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAlignment:left-padding:
......@@ -202,7 +201,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
/**
* GtkAlignment:right-padding:
......@@ -219,7 +218,7 @@ gtk_alignment_class_init (GtkAlignmentClass *class)
0,
G_MAXINT,
0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_type_class_add_private (gobject_class, sizeof (GtkAlignmentPrivate));
}
......
......@@ -27,6 +27,7 @@
#include <config.h>
#include <math.h>
#include "gtkarrow.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -94,8 +95,6 @@ gtk_arrow_class_init (GtkArrowClass *class)
gobject_class->set_property = gtk_arrow_set_property;
gobject_class->get_property = gtk_arrow_get_property;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_ARROW_TYPE,
g_param_spec_enum ("arrow-type",
......@@ -103,7 +102,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
P_("The direction the arrow should point"),
GTK_TYPE_ARROW_TYPE,
GTK_ARROW_RIGHT,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE,
g_param_spec_enum ("shadow-type",
......@@ -111,7 +110,7 @@ gtk_arrow_class_init (GtkArrowClass *class)
P_("Appearance of the shadow surrounding the arrow"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_OUT,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
widget_class->expose_event = gtk_arrow_expose;
}
......
......@@ -31,6 +31,7 @@
#include <config.h>
#include "gtkaspectframe.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -104,36 +105,34 @@ gtk_aspect_frame_class_init (GtkAspectFrameClass *class)
frame_class->compute_child_allocation = gtk_aspect_frame_compute_child_allocation;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_XALIGN,
g_param_spec_float ("xalign",
P_("Horizontal Alignment"),
P_("X alignment of the child"),
0.0, 1.0, 0.5,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_YALIGN,
g_param_spec_float ("yalign",
P_("Vertical Alignment"),
P_("Y alignment of the child"),
0.0, 1.0, 0.5,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_RATIO,
g_param_spec_float ("ratio",
P_("Ratio"),
P_("Aspect ratio if obey_child is FALSE"),
MIN_RATIO, MAX_RATIO, 0.5,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_OBEY_CHILD,
g_param_spec_boolean ("obey-child",
P_("Obey child"),
P_("Force aspect ratio to match that of the frame's child"),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
}
static void
......
......@@ -26,6 +26,7 @@
#include <config.h>
#include "gtkbbox.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -115,8 +116,6 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
/* FIXME we need to override the "spacing" property on GtkBox once
* libgobject allows that.
*/
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("child-min-width",
P_("Minimum child width"),
......@@ -124,7 +123,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
0,
G_MAXINT,
DEFAULT_CHILD_MIN_WIDTH,
G_PARAM_READABLE | STATIC_STRINGS));
GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("child-min-height",
......@@ -133,7 +132,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
0,
G_MAXINT,
DEFAULT_CHILD_MIN_HEIGHT,
G_PARAM_READABLE | STATIC_STRINGS));
GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("child-internal-pad-x",
......@@ -142,7 +141,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
0,
G_MAXINT,
DEFAULT_CHILD_IPAD_X,
G_PARAM_READABLE | STATIC_STRINGS));
GTK_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("child-internal-pad-y",
......@@ -151,7 +150,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
0,
G_MAXINT,
DEFAULT_CHILD_IPAD_Y,
G_PARAM_READABLE | STATIC_STRINGS));
GTK_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_LAYOUT_STYLE,
g_param_spec_enum ("layout-style",
......@@ -159,7 +158,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
P_("How to layout the buttons in the box. Possible values are default, spread, edge, start and end"),
GTK_TYPE_BUTTON_BOX_STYLE,
GTK_BUTTONBOX_DEFAULT_STYLE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_SECONDARY,
......@@ -167,7 +166,7 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
P_("Secondary"),
P_("If TRUE, the child appears in a secondary group of children, suitable for, e.g., help buttons"),
FALSE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
}
static void
......
......@@ -26,6 +26,7 @@
#include <config.h>
#include "gtkbox.h"
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"
......@@ -124,8 +125,6 @@ gtk_box_class_init (GtkBoxClass *class)
container_class->set_child_property = gtk_box_set_child_property;
container_class->get_child_property = gtk_box_get_child_property;
#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
g_object_class_install_property (gobject_class,
PROP_SPACING,
g_param_spec_int ("spacing",
......@@ -134,7 +133,7 @@ gtk_box_class_init (GtkBoxClass *class)
0,
G_MAXINT,
0,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_HOMOGENEOUS,
......@@ -142,7 +141,7 @@ gtk_box_class_init (GtkBoxClass *class)
P_("Homogeneous"),
P_("Whether the children should all be the same size"),
FALSE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_EXPAND,
......@@ -150,35 +149,35 @@ gtk_box_class_init (GtkBoxClass *class)
P_("Expand"),
P_("Whether the child should receive extra space when the parent grows"),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));
GTK_PARAM_READWRITE));
gtk_container_class_install_child_property (container_class,
CHILD_PROP_FILL,
g_param_spec_boolean ("fill",
P_("Fill"),
P_("Whether extra space given to the child should be allocated to the child or used as padding"),
TRUE,
G_PARAM_READWRITE | STATIC_STRINGS));