]> Pileus Git - ~andy/gtk/commitdiff
Define macros GTK_PARAM_READABLE, GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE
authorMatthias Clasen <mclasen@redhat.com>
Tue, 22 Mar 2005 02:14:55 +0000 (02:14 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Tue, 22 Mar 2005 02:14:55 +0000 (02:14 +0000)
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.

102 files changed:
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-8
gtk/gtkaboutdialog.c
gtk/gtkaccellabel.c
gtk/gtkaction.c
gtk/gtkactiongroup.c
gtk/gtkadjustment.c
gtk/gtkalignment.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkbbox.c
gtk/gtkbox.c
gtk/gtkbutton.c
gtk/gtkcalendar.c
gtk/gtkcellrenderer.c
gtk/gtkcellrenderercombo.c
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrendererprogress.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertoggle.c
gtk/gtkcellview.c
gtk/gtkcheckbutton.c
gtk/gtkcheckmenuitem.c
gtk/gtkclist.c
gtk/gtkcolorbutton.c
gtk/gtkcolorsel.c
gtk/gtkcombo.c
gtk/gtkcombobox.c
gtk/gtkcomboboxentry.c
gtk/gtkcontainer.c
gtk/gtkctree.c
gtk/gtkcurve.c
gtk/gtkdialog.c
gtk/gtkentry.c
gtk/gtkentrycompletion.c
gtk/gtkeventbox.c
gtk/gtkexpander.c
gtk/gtkfilechooser.c
gtk/gtkfilechooserbutton.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilesel.c
gtk/gtkfixed.c
gtk/gtkfontbutton.c
gtk/gtkfontsel.c
gtk/gtkframe.c
gtk/gtkhandlebox.c
gtk/gtkiconview.c
gtk/gtkimage.c
gtk/gtkimagemenuitem.c
gtk/gtkinvisible.c
gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklist.c
gtk/gtkmenu.c
gtk/gtkmenubar.c
gtk/gtkmenuitem.c
gtk/gtkmenutoolbutton.c
gtk/gtkmessagedialog.c
gtk/gtkmisc.c
gtk/gtknotebook.c
gtk/gtkobject.c
gtk/gtkoldeditable.c
gtk/gtkoptionmenu.c
gtk/gtkpaned.c
gtk/gtkpreview.c
gtk/gtkprivate.h
gtk/gtkprogress.c
gtk/gtkprogressbar.c
gtk/gtkradioaction.c
gtk/gtkradiobutton.c
gtk/gtkradiotoolbutton.c
gtk/gtkrange.c
gtk/gtkruler.c
gtk/gtkscale.c
gtk/gtkscrollbar.c
gtk/gtkscrolledwindow.c
gtk/gtkseparatortoolitem.c
gtk/gtksettings.c
gtk/gtksizegroup.c
gtk/gtkspinbutton.c
gtk/gtkstatusbar.c
gtk/gtktable.c
gtk/gtktext.c
gtk/gtktextbuffer.c
gtk/gtktexttag.c
gtk/gtktextview.c
gtk/gtktipsquery.c
gtk/gtktoggleaction.c
gtk/gtktogglebutton.c
gtk/gtktoggletoolbutton.c
gtk/gtktoolbar.c
gtk/gtktoolbutton.c
gtk/gtktoolitem.c
gtk/gtktreemodelfilter.c
gtk/gtktreemodelsort.c
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtkuimanager.c
gtk/gtkviewport.c
gtk/gtkwidget.c
gtk/gtkwindow.c

index 983ce18e61c5f38b56f4b7413f520f358c0cd314..e2f96a9b192721352a0587d35de8bad38af668f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 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>
index 983ce18e61c5f38b56f4b7413f520f358c0cd314..e2f96a9b192721352a0587d35de8bad38af668f4 100644 (file)
@@ -1,5 +1,13 @@
 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>
index 983ce18e61c5f38b56f4b7413f520f358c0cd314..e2f96a9b192721352a0587d35de8bad38af668f4 100644 (file)
@@ -1,5 +1,13 @@
 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>
index c3584ad9f4a5599e4e1a482fab58225d8deebad6..fcecc485c43811e62a101d9c9b52c597dd04f3ea 100644 (file)
@@ -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));
 }
index bd2905435298ded300274539a9f52c8543e995df..a78e8129052db425daa159884642f19a8fcdf56d 100644 (file)
@@ -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
index ec9620717921825215e17082f0d0015fa5c2c604..5250b7cc9c795a7299c7d7eaa41aff6930e3162b 100644 (file)
@@ -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:
index 81a2118861d2b90a2a52bfdfaa5554c46c96e52f..6f55c27326cf1f572783282271194e57ba0eb12c 100644 (file)
@@ -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:
index 924422efa6123c465c028518eb07727629b900af..c547e38bdc96a69f173dbe0231defdca03685afb 100644 (file)
@@ -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] =
index 9217bc563aded6b5570fa753033993f9a54b6be7..94eea7b0c20eb6a25555a9b84225ce29707b2c0c 100644 (file)
@@ -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));  
 }
index 3e4ad7d1af02400c8295d93d6b1e8ed98ce6b20a..7494f82ff85390e051599bcb81dfa99cb5b41c82 100644 (file)
@@ -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;
 }
index ef5b833230b3040d299fdd34f1f781e05a185fb4..52685354aba188b3c1836d0537ae96805ca562a8 100644 (file)
@@ -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
index 53f12e42301c09109b76f97050c0dc2288b4b4fe..e8197c45c14277f35e4811587ce30e1d39c5666f 100644 (file)
@@ -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
index feea4ed396a1f10665abad708eb74c0855cebd4c..251572f8aceea1913083c244711ce574836c1553 100644 (file)
@@ -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));
+                                                                   GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_PADDING,
                                              g_param_spec_uint ("padding", 
                                                                 P_("Padding"), 
                                                                 P_("Extra space to put between the child and its neighbors, in pixels"),
                                                                 0, G_MAXINT, 0,
-                                                                G_PARAM_READWRITE | STATIC_STRINGS));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_PACK_TYPE,
                                              g_param_spec_enum ("pack-type", 
                                                                 P_("Pack type"), 
                                                                 P_("A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"),
                                                                 GTK_TYPE_PACK_TYPE, GTK_PACK_START,
-                                                                G_PARAM_READWRITE | STATIC_STRINGS));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_POSITION,
                                              g_param_spec_int ("position", 
                                                                P_("Position"), 
                                                                P_("The index of the child in the parent"),
                                                                -1, G_MAXINT, 0,
-                                                               G_PARAM_READWRITE | STATIC_STRINGS));
+                                                               GTK_PARAM_READWRITE));
 }
 
 static void
index 3b5751811473dae90155af9d78213a7c43c3948d..1980c5155753bcb1ed3ee250f9f7882355e99228 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtkhbox.h"
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -214,15 +215,13 @@ gtk_button_class_init (GtkButtonClass *klass)
   klass->leave = gtk_button_update_state;
   klass->activate = gtk_real_button_activate;
 
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   g_object_class_install_property (gobject_class,
                                    PROP_LABEL,
                                    g_param_spec_string ("label",
                                                         P_("Label"),
                                                         P_("Text of the label widget inside the button, if the button contains a label widget"),
                                                         NULL,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   
   g_object_class_install_property (gobject_class,
                                    PROP_USE_UNDERLINE,
@@ -230,7 +229,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                         P_("Use underline"),
                                                         P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   
   g_object_class_install_property (gobject_class,
                                    PROP_USE_STOCK,
@@ -238,7 +237,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                         P_("Use stock"),
                                                         P_("If set, the label is used to pick a stock item instead of being displayed"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   
   g_object_class_install_property (gobject_class,
                                    PROP_FOCUS_ON_CLICK,
@@ -246,7 +245,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                         P_("Focus on click"),
                                                         P_("Whether the button grabs focus when it is clicked with the mouse"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_RELIEF,
@@ -255,7 +254,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                       P_("The border relief style"),
                                                       GTK_TYPE_RELIEF_STYLE,
                                                       GTK_RELIEF_NORMAL,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
   
   /**
    * GtkButton:xalign:
@@ -274,7 +273,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
 
   /**
    * GtkButton:yalign:
@@ -293,7 +292,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
 
   /**
    * GtkButton::image:
@@ -308,7 +307,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                         P_("Image widget"),
                                                         P_("Child widget to appear next to the button text"),
                                                         GTK_TYPE_WIDGET,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
   button_signals[PRESSED] =
     g_signal_new ("pressed",
@@ -375,14 +374,14 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                               P_("Default Spacing"),
                                                               P_("Extra space to add for CAN_DEFAULT buttons"),
                                                               GTK_TYPE_BORDER,
-                                                              G_PARAM_READABLE | STATIC_STRINGS));
+                                                              GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boxed ("default-outside-border",
                                                               P_("Default Outside Spacing"),
                                                               P_("Extra space to add for CAN_DEFAULT buttons that is always drawn outside the border"),
                                                               GTK_TYPE_BORDER,
-                                                              G_PARAM_READABLE | STATIC_STRINGS));
+                                                              GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("child-displacement-x",
                                                             P_("Child X Displacement"),
@@ -390,7 +389,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE | STATIC_STRINGS));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("child-displacement-y",
                                                             P_("Child Y Displacement"),
@@ -398,7 +397,7 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE | STATIC_STRINGS));
+                                                            GTK_PARAM_READABLE));
 
   /**
    * GtkButton:displace-focus:
@@ -413,13 +412,13 @@ gtk_button_class_init (GtkButtonClass *klass)
                                                                 P_("Displace focus"),
                                                                 P_("Whether the child_displacement_x/_y properties should also affect the focus rectangle"),
                                                       FALSE,
-                                                      G_PARAM_READABLE | STATIC_STRINGS));
+                                                      GTK_PARAM_READABLE));
 
   gtk_settings_install_property (g_param_spec_boolean ("gtk-button-images",
                                                       P_("Show button images"),
                                                       P_("Whether stock icons should be shown in buttons"),
                                                       TRUE,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
   
   g_type_class_add_private (gobject_class, sizeof (GtkButtonPrivate));  
 }
index 58edb9a830cbefe974cc0ac75aa604cf5ed5a87d..a96817eb2363f4914048b8337c06f0ad2518fc8e 100644 (file)
@@ -47,6 +47,7 @@
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkalias.h"
@@ -465,29 +466,27 @@ gtk_calendar_class_init (GtkCalendarClass *class)
   class->prev_year = NULL;
   class->next_year = NULL;
 
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   g_object_class_install_property (gobject_class,
                                    PROP_YEAR,
                                    g_param_spec_int ("year",
                                                     P_("Year"),
                                                     P_("The selected year"),
                                                     0, G_MAXINT, 0,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_MONTH,
                                    g_param_spec_int ("month",
                                                     P_("Month"),
                                                     P_("The selected month (as a number between 0 and 11)"),
                                                     0, 11, 0,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_DAY,
                                    g_param_spec_int ("day",
                                                     P_("Day"),
                                                     P_("The selected day (as a number between 1 and 31, or 0 to unselect the currently selected day)"),
                                                     0, 31, 0,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-heading:
@@ -502,7 +501,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                                         P_("Show Heading"),
                                                         P_("If TRUE, a heading is displayed"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-day-names:
@@ -517,7 +516,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                                         P_("Show Day Names"),
                                                         P_("If TRUE, day names are displayed"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 /**
  * GtkCalendar:no-month-change:
  *
@@ -531,7 +530,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                                         P_("No Month Change"),
                                                         P_("If TRUE, the selected month cannot be changed"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
 /**
  * GtkCalendar:show-week-numbers:
@@ -546,7 +545,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
                                                         P_("Show Week Numbers"),
                                                         P_("If TRUE, week numbers are displayed"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_calendar_signals[MONTH_CHANGED_SIGNAL] =
     g_signal_new ("month_changed",
index db91cdfc169aa0ddab985968dc5d136c8e55b416..5e6477be6acae5f090ab33667166f1a1d51e8cd1 100644 (file)
@@ -21,6 +21,7 @@
 #include "gtkcellrenderer.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtktreeprivate.h"
 #include "gtkalias.h"
 
@@ -199,8 +200,6 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                  GTK_TYPE_CELL_EDITABLE,
                  G_TYPE_STRING);
 
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   g_object_class_install_property (object_class,
                                   PROP_MODE,
                                   g_param_spec_enum ("mode",
@@ -208,7 +207,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                      P_("Editable mode of the CellRenderer"),
                                                      GTK_TYPE_CELL_RENDERER_MODE,
                                                      GTK_CELL_RENDERER_MODE_INERT,
-                                                     G_PARAM_READWRITE | STATIC_STRINGS));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_VISIBLE,
@@ -216,14 +215,14 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                         P_("visible"),
                                                         P_("Display the cell"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_SENSITIVE,
                                   g_param_spec_boolean ("sensitive",
                                                         P_("Sensitive"),
                                                         P_("Display the cell sensitive"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_XALIGN,
@@ -233,7 +232,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_YALIGN,
@@ -243,7 +242,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_XPAD,
@@ -253,7 +252,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      0,
-                                                     G_PARAM_READWRITE | STATIC_STRINGS));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_YPAD,
@@ -263,7 +262,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      0,
-                                                     G_PARAM_READWRITE | STATIC_STRINGS));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_WIDTH,
@@ -273,7 +272,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_HEIGHT,
@@ -283,7 +282,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_IS_EXPANDER,
@@ -291,7 +290,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                         P_("Is Expander"),
                                                         P_("Row has children"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
 
   g_object_class_install_property (object_class,
@@ -300,7 +299,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                         P_("Is Expanded"),
                                                         P_("Row is an expander row, and is expanded"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_CELL_BACKGROUND,
@@ -308,7 +307,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                        P_("Cell background color name"),
                                                        P_("Cell background color as a string"),
                                                        NULL,
-                                                       G_PARAM_WRITABLE | STATIC_STRINGS));
+                                                       GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                   PROP_CELL_BACKGROUND_GDK,
@@ -316,10 +315,10 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class)
                                                       P_("Cell background color"),
                                                       P_("Cell background color as a GdkColor"),
                                                       GDK_TYPE_COLOR,
-                                                      G_PARAM_READWRITE | STATIC_STRINGS));
+                                                      GTK_PARAM_READWRITE));
 
 
-#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READWRITE | STATIC_STRINGS))
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
 
   ADD_SET_PROP ("cell-background-set", PROP_CELL_BACKGROUND_SET,
                 P_("Cell background set"),
index 3acf92f56abd1dbd5e0be902a13c0b3c2ade2fb4..35dcbc79d446a2d016bb64533b003f19151652e4 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkcellrenderertext.h"
 #include "gtkcombobox.h"
 #include "gtkcomboboxentry.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 static void gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass);
@@ -74,8 +75,6 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
 
   cell_class->start_editing = gtk_cell_renderer_combo_start_editing;
 
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   /**
    * GtkCellRendererCombo:model:
    *
@@ -90,7 +89,7 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
                                                        P_("Model"),
                                                        P_("The model containing the possible values for the combo box"),
                                                        GTK_TYPE_TREE_MODEL,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkCellRendererCombo:text-column:
@@ -113,7 +112,7 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE | STATIC_STRINGS));
+                                                     GTK_PARAM_READWRITE));
 
   /** 
    * GtkCellRendererCombo:has-entry:
@@ -129,7 +128,7 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
                                                         P_("Has Entry"),
                                                         P_("If FALSE, don't allow to enter strings other than the chosen ones"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
 }
 
index 3f628602677b2b443862fbc1d9cad8af006e8eed..f3839ea791896d9cfc3548eed5259266d0c4bf7e 100644 (file)
@@ -22,6 +22,7 @@
 #include "gtkcellrendererpixbuf.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 static void gtk_cell_renderer_pixbuf_get_property  (GObject                    *object,
@@ -132,15 +133,13 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
   cell_class->get_size = gtk_cell_renderer_pixbuf_get_size;
   cell_class->render = gtk_cell_renderer_pixbuf_render;
 
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   g_object_class_install_property (object_class,
                                   PROP_PIXBUF,
                                   g_param_spec_object ("pixbuf",
                                                        P_("Pixbuf Object"),
                                                        P_("The pixbuf to render"),
                                                        GDK_TYPE_PIXBUF,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_PIXBUF_EXPANDER_OPEN,
@@ -148,7 +147,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                        P_("Pixbuf Expander Open"),
                                                        P_("Pixbuf for open expander"),
                                                        GDK_TYPE_PIXBUF,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_PIXBUF_EXPANDER_CLOSED,
@@ -156,7 +155,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                        P_("Pixbuf Expander Closed"),
                                                        P_("Pixbuf for closed expander"),
                                                        GDK_TYPE_PIXBUF,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_STOCK_ID,
@@ -164,7 +163,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                        P_("Stock ID"),
                                                        P_("The stock ID of the stock icon to render"),
                                                        NULL,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_STOCK_SIZE,
@@ -174,7 +173,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      GTK_ICON_SIZE_MENU,
-                                                     G_PARAM_READWRITE | STATIC_STRINGS));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_STOCK_DETAIL,
@@ -182,7 +181,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                        P_("Detail"),
                                                        P_("Render detail to pass to the theme engine"),
                                                        NULL,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkCellRendererPixbuf:follow-state:
@@ -199,7 +198,7 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
                                                         P_("Whether the rendered pixbuf should be "
                                                            "colorized according to the state"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | STATIC_STRINGS));
+                                                        GTK_PARAM_READWRITE));
 
 
   g_type_class_add_private (object_class, sizeof (GtkCellRendererPixbufPrivate));
index 340c04a5246f76958c19d0868727a2053858cf7c..a5b0d95ff72e79ecd283c17c8183d2b391ee87cb 100644 (file)
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 
 #include "gtkcellrendererprogress.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -101,8 +102,6 @@ gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass)
   cell_class->get_size = gtk_cell_renderer_progress_get_size;
   cell_class->render = gtk_cell_renderer_progress_render;
   
-#define STATIC_STRINGS G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
-
   /**
    * GtkCellRendererProgress:value:
    * 
@@ -117,7 +116,7 @@ gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass)
                                                     P_("Value"),
                                                     P_("Value of the progress bar"),
                                                     0, 100, 0,
-                                                    G_PARAM_READWRITE | STATIC_STRINGS));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkCellRendererProgress:text:
@@ -135,7 +134,7 @@ gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *klass)
                                                        P_("Text"),
                                                        P_("Text on the progress bar"),
                                                        NULL,
-                                                       G_PARAM_READWRITE | STATIC_STRINGS));
+                                                       GTK_PARAM_READWRITE));
 
   g_type_class_add_private (object_class, 
                            sizeof (GtkCellRendererProgressPrivate));
index 9527604f159fa1263055e2d37726f620f55f1b70..7c401bd60b0454339295cf10f362ef85fa03c074 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtkentry.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtktreeprivate.h"
 #include "gtkalias.h"
 
@@ -211,14 +212,14 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
   cell_class->get_size = gtk_cell_renderer_text_get_size;
   cell_class->render = gtk_cell_renderer_text_render;
   cell_class->start_editing = gtk_cell_renderer_text_start_editing;
-  
+
   g_object_class_install_property (object_class,
                                    PROP_TEXT,
                                    g_param_spec_string ("text",
                                                         P_("Text"),
                                                         P_("Text to render"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_MARKUP,
@@ -226,7 +227,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         P_("Markup"),
                                                         P_("Marked up text to render"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                   PROP_ATTRIBUTES,
@@ -234,7 +235,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                       P_("Attributes"),
                                                       P_("A list of style attributes to apply to the text of the renderer"),
                                                       PANGO_TYPE_ATTR_LIST,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SINGLE_PARAGRAPH_MODE,
@@ -242,7 +243,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                          P_("Single Paragraph Mode"),
                                                          P_("Whether or not to keep all text in a single paragraph"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -251,7 +252,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         P_("Background color name"),
                                                         P_("Background color as a string"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_BACKGROUND_GDK,
@@ -259,7 +260,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                        P_("Background color"),
                                                        P_("Background color as a GdkColor"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                       GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (object_class,
                                    PROP_FOREGROUND,
@@ -267,7 +268,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         P_("Foreground color name"),
                                                         P_("Foreground color as a string"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_FOREGROUND_GDK,
@@ -275,7 +276,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                        P_("Foreground color"),
                                                        P_("Foreground color as a GdkColor"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
 
   g_object_class_install_property (object_class,
@@ -284,7 +285,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                          P_("Editable"),
                                                          P_("Whether the text can be modified by the user"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_FONT,
@@ -292,7 +293,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         P_("Font"),
                                                         P_("Font description as a string"),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_FONT_DESC,
@@ -300,7 +301,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                        P_("Font"),
                                                        P_("Font description as a PangoFontDescription struct"),
                                                        PANGO_TYPE_FONT_DESCRIPTION,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -309,7 +310,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         P_("Font family"),
                                                         P_("Name of the font family, e.g. Sans, Helvetica, Times, Monospace"),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_STYLE,
@@ -318,7 +319,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                       P_("Font style"),
                                                       PANGO_TYPE_STYLE,
                                                       PANGO_STYLE_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_VARIANT,
@@ -327,7 +328,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                      P_("Font variant"),
                                                       PANGO_TYPE_VARIANT,
                                                       PANGO_VARIANT_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_WEIGHT,
@@ -337,7 +338,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      PANGO_WEIGHT_NORMAL,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
    g_object_class_install_property (object_class,
                                    PROP_STRETCH,
@@ -346,7 +347,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                       P_("Font stretch"),
                                                       PANGO_TYPE_STRETCH,
                                                       PANGO_STRETCH_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_SIZE,
@@ -356,7 +357,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SIZE_POINTS,
@@ -366,7 +367,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         0.0,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                        GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (object_class,
                                    PROP_SCALE,
@@ -376,7 +377,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         1.0,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_RISE,
@@ -387,7 +388,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                      -G_MAXINT,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
 
   g_object_class_install_property (object_class,
@@ -396,7 +397,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                          P_("Strikethrough"),
                                                          P_("Whether to strike through the text"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_UNDERLINE,
@@ -405,7 +406,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                       P_("Style of underline for this text"),
                                                       PANGO_TYPE_UNDERLINE,
                                                       PANGO_UNDERLINE_NONE,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_LANGUAGE,
@@ -415,7 +416,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                           "Pango can use this as a hint when rendering the text. "
                                                           "If you don't understand this parameter, you probably don't need it"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
 
   /**
@@ -437,7 +438,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         "to display the entire string, if at all"),
                                                      PANGO_TYPE_ELLIPSIZE_MODE,
                                                      PANGO_ELLIPSIZE_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkCellRendererText:width-chars:
@@ -456,14 +457,14 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   /**
    * GtkCellRendererText:wrap-mode:
    *
-   * Specifies how to break the string into multiple lines, if the cell renderer 
-   * does not have enough room to display the entire string. This property has no
-   * effect unless the wrap-width property is set.
+   * Specifies how to break the string into multiple lines, if the cell 
+   * renderer does not have enough room to display the entire string. 
+   * This property has no effect unless the wrap-width property is set.
    *
    * Since: 2.8
    */
@@ -476,7 +477,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                         "to display the entire string"),
                                                      PANGO_TYPE_WRAP_MODE,
                                                      PANGO_WRAP_CHAR,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkCellRendererText:wrap-width:
@@ -495,12 +496,12 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   
   /* Style props are set or not */
 
-#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
 
   ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
                 P_("Background set"),
index a0c9be559c2eb10c031a7f2ee39bdebc5f555a04..f0299b958ea93c126f0eace00d80b3a61ced5de7 100644 (file)
@@ -22,6 +22,7 @@
 #include "gtkcellrenderertoggle.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtktreeprivate.h"
 #include "gtkalias.h"
 
@@ -142,8 +143,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
                                                         P_("Toggle state"),
                                                         P_("The toggle state of the button"),
                                                         FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_INCONSISTENT,
@@ -151,8 +151,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
                                                         P_("Inconsistent state"),
                                                         P_("The inconsistent state of the button"),
                                                         FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                   PROP_ACTIVATABLE,
@@ -160,8 +159,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
                                                         P_("Activatable"),
                                                         P_("The toggle button can be activated"),
                                                         TRUE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                   PROP_RADIO,
@@ -169,8 +167,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
                                                         P_("Radio state"),
                                                         P_("Draw the toggle button as a radio button"),
                                                         FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   
   /**
index 909a1b5a8ce799e8c48853927192b0feadb1348e..efdda51009d483d6a4d70fa413be7c7d06a99258 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtksignal.h"
 #include "gtkcellrenderertext.h"
 #include "gtkcellrendererpixbuf.h"
+#include "gtkprivate.h"
 #include <gobject/gmarshal.h>
 #include "gtkalias.h"
 
@@ -182,16 +183,16 @@ gtk_cell_view_class_init (GtkCellViewClass *klass)
                                                         P_("Background color name"),
                                                         P_("Background color as a string"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_BACKGROUND_GDK,
                                    g_param_spec_boxed ("background-gdk",
                                                       P_("Background color"),
                                                       P_("Background color as a GdkColor"),
                                                       GDK_TYPE_COLOR,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
-#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (gobject_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
 
   ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
                 P_("Background set"),
index 04a4d01f2bfd2aa2d05cdc6a8a2f699db0c02cd7..c0d767e222e6bff2f53ecbb20180c537978e8c8a 100644 (file)
@@ -26,8 +26,9 @@
 
 #include <config.h>
 #include "gtkcheckbutton.h"
-#include "gtkintl.h"
 #include "gtklabel.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -102,7 +103,7 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             INDICATOR_SIZE,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("indicator-spacing",
                                                             P_("Indicator Spacing"),
@@ -110,7 +111,7 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             INDICATOR_SPACING,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 }
 
 static void
index 9f78ccee0aff8d596ad8e19aab8e93d4725c84bb..f32ac853dc8726c9713972773ee74ed63a21f3ae 100644 (file)
@@ -27,8 +27,9 @@
 #include <config.h>
 #include "gtkcheckmenuitem.h"
 #include "gtkaccellabel.h"
-#include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 enum {
@@ -118,7 +119,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                                                          P_("Active"),
                                                          P_("Whether the menu item is checked"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_INCONSISTENT,
@@ -126,7 +127,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                                                          P_("Inconsistent"),
                                                          P_("Whether to display an \"inconsistent\" state"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DRAW_AS_RADIO,
@@ -134,7 +135,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                                                          P_("Draw as radio menu item"),
                                                          P_("Whether the menu item looks like a radio menu item"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("indicator-size",
@@ -144,7 +145,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
                                                              0,
                                                              G_MAXINT,
                                                              12,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
 
   widget_class->expose_event = gtk_check_menu_item_expose;
   
index ad77731cf415710462873c3c5977846a4ce1dd44..547b2496edcdae8ca636f9f8f140a17e3073cb23 100644 (file)
@@ -578,35 +578,35 @@ gtk_clist_class_init (GtkCListClass *klass)
 
   gtk_object_add_arg_type ("GtkCList::n-columns",
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY,
+                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME,
                           ARG_N_COLUMNS);
   gtk_object_add_arg_type ("GtkCList::shadow-type",
                           GTK_TYPE_SHADOW_TYPE,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SHADOW_TYPE);
   gtk_object_add_arg_type ("GtkCList::selection-mode",
                           GTK_TYPE_SELECTION_MODE,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SELECTION_MODE);
   gtk_object_add_arg_type ("GtkCList::row-height",
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_ROW_HEIGHT);
   gtk_object_add_arg_type ("GtkCList::reorderable",
                           GTK_TYPE_BOOL,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_REORDERABLE);
   gtk_object_add_arg_type ("GtkCList::titles-active",
                           GTK_TYPE_BOOL,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_TITLES_ACTIVE);
   gtk_object_add_arg_type ("GtkCList::use-drag-icons",
                           GTK_TYPE_BOOL,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_USE_DRAG_ICONS);
   gtk_object_add_arg_type ("GtkCList::sort-type",
                           GTK_TYPE_SORT_TYPE,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SORT_TYPE);  
 
   widget_class->set_scroll_adjustments_signal =
index f096962fb42d4ccd1cd7d248e610c81d09d73e38..858d8d6387686b4cfa3f786658cd7df833320122 100644 (file)
@@ -43,6 +43,7 @@
 #include "gtkframe.h"
 #include "gtksignal.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -203,7 +204,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                    g_param_spec_boolean ("use-alpha", P_("Use alpha"), 
                                                          P_("Whether or not to give the color an alpha value"),
                                                          FALSE,
-                                                         (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+                                                         GTK_PARAM_READWRITE));
 
   /**
    * GtkColorButton:title:
@@ -218,7 +219,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                        P_("Title"), 
                                                         P_("The title of the color selection dialog"),
                                                         _("Pick a Color"),
-                                                        (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkColorButton:color:
@@ -233,7 +234,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                        P_("Current Color"),
                                                        P_("The selected color"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkColorButton:alpha:
@@ -248,7 +249,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
                                                       P_("Current Alpha"),
                                                       P_("The selected opacity value (0 fully transparent, 65535 fully opaque)"),
                                                       0, 65535, 65535,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
         
   /**
    * GtkColorButton::color-set:
index 119073838cac0fb04517a26f8bfebd8017bb3301..3ba309b6f5f06679f687ee85f9233cd187f1c807 100644 (file)
 #include "gtkmenuitem.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
-#include "gtkintl.h"
 #include "gtkimage.h"
 #include "gtkstock.h"
 #include "gtkaccessible.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #include <string.h>
@@ -1840,28 +1841,28 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
                                                         P_("Has Opacity Control"),
                                                         P_("Whether the color selector should allow setting opacity"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_HAS_PALETTE,
                                    g_param_spec_boolean ("has-palette",
                                                         P_("Has palette"),
                                                         P_("Whether a palette should be used"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_CURRENT_COLOR,
                                    g_param_spec_boxed ("current-color",
                                                        P_("Current Color"),
                                                        P_("The current color"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_CURRENT_ALPHA,
                                    g_param_spec_uint ("current-alpha",
                                                      P_("Current Alpha"),
                                                      P_("The current opacity value (0 fully transparent, 65535 fully opaque)"),
                                                      0, 65535, 65535,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   
   color_selection_signals[COLOR_CHANGED] =
     g_signal_new ("color_changed",
@@ -1876,7 +1877,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
                                                       P_("Custom palette"),
                                                       P_("Palette to use in the color selector"),
                                                       default_colors,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 }
 
 /* widget functions */
index e62d6018ee99461de0db6ab71859785c90d90395..7647b4853558b3d169ed7cef47c5d07d3d0b4eb6 100644 (file)
@@ -46,6 +46,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkcombo.h"
 #include "gtkframe.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -145,21 +146,21 @@ gtk_combo_class_init (GtkComboClass * klass)
                                                          P_("Enable arrow keys"),
                                                          P_("Whether the arrow keys move through the list of items"),
                                                          TRUE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_ENABLE_ARROWS_ALWAYS,
                                    g_param_spec_boolean ("enable-arrows-always",
                                                          P_("Always enable arrows"),
                                                          P_("Obsolete property, ignored"),
                                                          TRUE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_CASE_SENSITIVE,
                                    g_param_spec_boolean ("case-sensitive",
                                                          P_("Case sensitive"),
                                                          P_("Whether list item matching is case sensitive"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_EMPTY,
@@ -167,7 +168,7 @@ gtk_combo_class_init (GtkComboClass * klass)
                                                          P_("Allow empty"),
                                                         P_("Whether an empty value may be entered in this field"),
                                                          TRUE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_VALUE_IN_LIST,
@@ -175,7 +176,7 @@ gtk_combo_class_init (GtkComboClass * klass)
                                                          P_("Value in list"),
                                                          P_("Whether entered values must already be present in the list"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
    
   oclass->destroy = gtk_combo_destroy;
index 5a9a8b7b1241bae1935ff7b2e3bc32b125e0c878..7969c644208dceca48289a568185f6c81658ec1b 100644 (file)
@@ -38,6 +38,7 @@
 #include "gtktreeselection.h"
 #include "gtkvseparator.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
 
 #include <gdk/gdkkeysyms.h>
 
@@ -551,7 +552,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                         P_("ComboBox model"),
                                                         P_("The model for the combo box"),
                                                         GTK_TYPE_TREE_MODEL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkComboBox:wrap-width:
@@ -570,7 +571,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
 
   /**
@@ -593,7 +594,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
 
   /**
@@ -615,7 +616,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
 
   /**
@@ -636,7 +637,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkComboBox:add-tearoffs:
@@ -654,7 +655,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                         P_("Add tearoffs to menus"),
                                                         P_("Whether dropdowns should have a tearoff menu item"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   /**
    * GtkComboBox:has-frame:
@@ -670,7 +671,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                         P_("Has Frame"),
                                                         P_("Whether the combo box draws a frame around the child"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_FOCUS_ON_CLICK,
@@ -678,14 +679,14 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
                                                         P_("Focus on click"),
                                                         P_("Whether the combo box grabs focus when it is clicked with the mouse"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_boolean ("appears-as-list",
                                                                  P_("Appears as list"),
                                                                  P_("Whether dropdowns should look like lists rather than menus"),
                                                                  FALSE,
-                                                                 G_PARAM_READABLE));
+                                                                 GTK_PARAM_READABLE));
 
   g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate));
 }
index 9c3e698594ca3f83ca076a4dc4130418cd95c3a0..d13fd26f89549f55e1bdfd891ce9cf866022ff32 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtkentry.h"
 #include "gtkcellrenderertext.h"
 
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -116,7 +117,7 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   g_type_class_add_private ((GObjectClass *) klass,
                             sizeof (GtkComboBoxEntryPrivate));
index 45da39db509e6a9903807d5bc178134c2306a5af..98c42af1800c57e74df1e0f30acab2f7543b840c 100644 (file)
@@ -206,7 +206,7 @@ gtk_container_class_init (GtkContainerClass *class)
                                                       P_("Specify how resize events are handled"),
                                                       GTK_TYPE_RESIZE_MODE,
                                                       GTK_RESIZE_PARENT,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_BORDER_WIDTH,
                                    g_param_spec_uint ("border-width",
@@ -215,14 +215,14 @@ gtk_container_class_init (GtkContainerClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_CHILD,
                                    g_param_spec_object ("child",
                                                       P_("Child"),
                                                       P_("Can be used to add a new child to the container"),
                                                       GTK_TYPE_WIDGET,
-                                                     G_PARAM_WRITABLE));
+                                                     GTK_PARAM_WRITABLE));
   container_signals[ADD] =
     g_signal_new ("add",
                  G_OBJECT_CLASS_TYPE (object_class),
index 16e411ebdfacd80329f656f19d5f31c607c42e4a..791f7999c1fbbe9dbd3565c352ccfd582cebc009 100644 (file)
@@ -406,31 +406,31 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
 
   gtk_object_add_arg_type ("GtkCTree::n-columns", /* overrides GtkCList::n_columns!! */
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY,
+                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME,
                           ARG_N_COLUMNS);
   gtk_object_add_arg_type ("GtkCTree::tree-column",
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY,
+                          GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME,
                           ARG_TREE_COLUMN);
   gtk_object_add_arg_type ("GtkCTree::indent",
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_INDENT);
   gtk_object_add_arg_type ("GtkCTree::spacing",
                           GTK_TYPE_UINT,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SPACING);
   gtk_object_add_arg_type ("GtkCTree::show-stub",
                           GTK_TYPE_BOOL,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SHOW_STUB);
   gtk_object_add_arg_type ("GtkCTree::line-style",
                           GTK_TYPE_CTREE_LINE_STYLE,
-                          GTK_ARG_READWRITE,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_LINE_STYLE);
   gtk_object_add_arg_type ("GtkCTree::expander-style",
-                          GTK_TYPE_CTREE_EXPANDER_STYLE,
-                          GTK_ARG_READWRITE,
+                          GTK_TYPE_CTREE_EXPANDER_STYLE | G_PARAM_STATIC_NAME,
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_EXPANDER_STYLE);
 
   ctree_signals[TREE_SELECT_ROW] =
index 20f637ba8579bb7436bb7011e09a0f6669410041..5eb26e9d0b1d0d76f0bf7114151cab2d3095e03a 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
 #include "gtktable.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -124,8 +125,7 @@ gtk_curve_class_init (GtkCurveClass *class)
                                                      P_("Is this curve linear, spline interpolated, or free-form"),
                                                      GTK_TYPE_CURVE_TYPE,
                                                      GTK_CURVE_TYPE_LINEAR,
-                                                     G_PARAM_READABLE |
-                                                     G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MIN_X,
                                   g_param_spec_float ("min-x",
@@ -134,8 +134,7 @@ gtk_curve_class_init (GtkCurveClass *class)
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       0.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MAX_X,
                                   g_param_spec_float ("max-x",
@@ -144,8 +143,7 @@ gtk_curve_class_init (GtkCurveClass *class)
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                        1.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_MIN_Y,
                                   g_param_spec_float ("min-y",
@@ -154,8 +152,7 @@ gtk_curve_class_init (GtkCurveClass *class)
                                                        -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       0.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));  
+                                                      GTK_PARAM_READWRITE));  
   g_object_class_install_property (gobject_class,
                                   PROP_MAX_Y,
                                   g_param_spec_float ("max-y",
@@ -164,8 +161,7 @@ gtk_curve_class_init (GtkCurveClass *class)
                                                       -G_MAXFLOAT,
                                                       G_MAXFLOAT,
                                                       1.0,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   curve_type_changed_signal =
     g_signal_new ("curve_type_changed",
index c860acd407fd1f55c47ca52440ac81fdce75344e..77b207d8a64e04ed87548d1d5cd6f127ceaaf6ae 100644 (file)
@@ -36,6 +36,7 @@
 #include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkbindings.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
@@ -148,7 +149,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                         P_("Has separator"),
                                                         P_("The dialog has a separator bar above its buttons"),
                                                          TRUE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   
   dialog_signals[RESPONSE] =
     g_signal_new ("response",
@@ -176,7 +177,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              2,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("button-spacing",
                                                              P_("Button spacing"),
@@ -184,7 +185,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              10,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
   
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_int ("action-area-border",
@@ -193,7 +194,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              5,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
 
   binding_set = gtk_binding_set_by_class (class);
   
index 0ad8879f2d1e3d05f9e97c18a329eb2b3944566e..e1212d85586d5e1075d5a23945c3cc4f31efc2fd 100644 (file)
@@ -50,6 +50,7 @@
 #include "gtkwindow.h"
 #include "gtktreeview.h"
 #include "gtktreeselection.h"
+#include "gtkprivate.h"
 #include "gtkentryprivate.h"
 #include "gtkcelllayout.h"
 #include "gtkalias.h"
@@ -487,7 +488,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                      0,
                                                      MAX_SIZE,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_SELECTION_BOUND,
@@ -497,7 +498,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                      0,
                                                      MAX_SIZE,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_EDITABLE,
@@ -505,7 +506,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                         P_("Editable"),
                                                         P_("Whether the entry contents can be edited"),
                                                          TRUE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_MAX_LENGTH,
@@ -515,14 +516,14 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                      0,
                                                      MAX_SIZE,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_VISIBILITY,
                                    g_param_spec_boolean ("visibility",
                                                         P_("Visibility"),
                                                         P_("FALSE displays the \"invisible char\" instead of the actual text (password mode)"),
                                                          TRUE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_HAS_FRAME,
@@ -530,7 +531,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                         P_("Has Frame"),
                                                         P_("FALSE removes outside bevel from entry"),
                                                          TRUE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_INVISIBLE_CHAR,
@@ -538,7 +539,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                         P_("Invisible character"),
                                                         P_("The character to use when masking entry contents (in \"password mode\")"),
                                                         '*',
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ACTIVATES_DEFAULT,
@@ -546,7 +547,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                         P_("Activates default"),
                                                         P_("Whether to activate the default widget (such as the default button in a dialog) when Enter is pressed"),
                                                          FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_WIDTH_CHARS,
                                    g_param_spec_int ("width-chars",
@@ -555,7 +556,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SCROLL_OFFSET,
@@ -565,7 +566,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_TEXT,
@@ -573,7 +574,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                        P_("Text"),
                                                        P_("The contents of the entry"),
                                                        "",
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkEntry:xalign:
@@ -591,7 +592,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.0,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   signals[POPULATE_POPUP] =
     g_signal_new ("populate_popup",
@@ -828,7 +829,7 @@ gtk_entry_class_init (GtkEntryClass *class)
                                                       P_("Select on focus"),
                                                       P_("Whether to select the contents of an entry when it is focused"),
                                                       TRUE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_type_class_add_private (gobject_class, sizeof (GtkEntryPrivate));
 }
index e001a3db3ed2c071a7ad7f6e5fbc4979bda13b1c..bad279f205454b4ead6c948a83f6f19b9c8f032f 100644 (file)
@@ -21,7 +21,6 @@
 #include "gtkentrycompletion.h"
 #include "gtkentryprivate.h"
 #include "gtkcelllayout.h"
-#include "gtkalias.h"
 
 #include "gtkintl.h"
 #include "gtkcellrenderertext.h"
@@ -36,6 +35,9 @@
 #include "gtksignal.h"
 #include "gtkmarshalers.h"
 
+#include "gtkprivate.h"
+#include "gtkalias.h"
+
 #include <string.h>
 
 
@@ -272,7 +274,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                         P_("Completion Model"),
                                                         P_("The model to find matches in"),
                                                         GTK_TYPE_TREE_MODEL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                    PROP_MINIMUM_KEY_LENGTH,
                                    g_param_spec_int ("minimum-key-length",
@@ -281,7 +283,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   /**
    * GtkEntryCompletion:text-column:
    *
@@ -297,7 +299,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkEntryCompletion:inline-completion:
@@ -315,7 +317,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                         P_("Inline completion"),
                                                         P_("Whether the common prefix should be inserted automatically"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   /**
    * GtkEntryCompletion:popup-completion:
    * 
@@ -330,7 +332,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
                                                         P_("Popup completion"),
                                                         P_("Whether the completions should be shown in a popup window"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_type_class_add_private (object_class, sizeof (GtkEntryCompletionPrivate));
 }
index 4fa3ab8d0900ffb7c280e6c27548c857a4ed02ca..8e22ff6322f4740e97d055ca1934abdcbac8e5a8 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkeventbox.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -121,14 +122,14 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
                                                         P_("Visible Window"),
                                                         P_("Whether the event box is visible, as opposed to invisible and only used to trap events."),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_ABOVE_CHILD,
                                    g_param_spec_boolean ("above-child",
                                                         P_("Above child"),
                                                         P_("Whether the event-trapping window of the eventbox is above the window of the child widget as opposed to below it."),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_type_class_add_private (class, sizeof (GtkEventBoxPrivate));
 }
index 82516f7111e41f0a1e5d2127dc7e15652c17af5f..069f2a6a62395af81cdaef1cb165e31d72df37d0 100644 (file)
@@ -198,7 +198,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                         P_("Expanded"),
                                                         P_("Whether the expander has been opened to reveal the child widget"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL,
@@ -206,7 +206,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                        P_("Label"),
                                                        P_("Text of the expander's label"),
                                                        NULL,
-                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                   PROP_USE_UNDERLINE,
@@ -214,7 +214,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                         P_("Use underline"),
                                                         P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                   PROP_USE_MARKUP,
@@ -222,7 +222,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                         P_("Use markup"),
                                                         P_("The text of the label includes XML markup. See pango_parse_markup()"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                   PROP_SPACING,
@@ -232,7 +232,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_WIDGET,
@@ -240,7 +240,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                        P_("Label widget"),
                                                        P_("A widget to display in place of the usual expander label"),
                                                        GTK_TYPE_WIDGET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("expander-size",
@@ -249,7 +249,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                             DEFAULT_EXPANDER_SIZE,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("expander-spacing",
@@ -258,7 +258,7 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                             DEFAULT_EXPANDER_SPACING,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   widget_class->activate_signal =
     g_signal_new ("activate",
index 994e5cde5e48fe04f012bc7e8e7c58ad0d39793f..0c12919316d2975758194077310e27f40f6e3a9d 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtkfilesystem.h"
 #include "gtkintl.h"
 #include "gtktypebuiltins.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 static void gtk_file_chooser_class_init (gpointer g_iface);
@@ -177,62 +178,62 @@ gtk_file_chooser_class_init (gpointer g_iface)
                                                          P_("The type of operation that the file selector is performing"),
                                                          GTK_TYPE_FILE_CHOOSER_ACTION,
                                                          GTK_FILE_CHOOSER_ACTION_OPEN,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_string ("file-system-backend",
                                                            P_("File System Backend"),
                                                            P_("Name of file system backend to use"),
                                                            NULL, 
-                                                           G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+                                                           GTK_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_object ("filter",
                                                            P_("Filter"),
                                                            P_("The current filter for selecting which files are displayed"),
                                                            GTK_TYPE_FILE_FILTER,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_boolean ("local-only",
                                                             P_("Local Only"),
                                                             P_("Whether the selected file(s) should be limited to local file: URLs"),
                                                             TRUE,
-                                                            G_PARAM_READWRITE));
+                                                            GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_object ("preview-widget",
                                                            P_("Preview widget"),
                                                            P_("Application supplied widget for custom previews."),
                                                            GTK_TYPE_WIDGET,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_boolean ("preview-widget-active",
                                                             P_("Preview Widget Active"),
                                                             P_("Whether the application supplied widget for custom previews should be shown."),
                                                             TRUE,
-                                                            G_PARAM_READWRITE));
+                                                            GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_boolean ("use-preview-label",
                                                             P_("Use Preview Label"),
                                                             P_("Whether to display a stock label with the name of the previewed file."),
                                                             TRUE,
-                                                            G_PARAM_READWRITE));
+                                                            GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_object ("extra-widget",
                                                            P_("Extra widget"),
                                                            P_("Application supplied widget for extra options."),
                                                            GTK_TYPE_WIDGET,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
   g_object_interface_install_property (g_iface,
                                       g_param_spec_boolean ("select-multiple",
                                                             P_("Select Multiple"),
                                                             P_("Whether to allow multiple files to be selected"),
                                                             FALSE,
-                                                            G_PARAM_READWRITE));
+                                                            GTK_PARAM_READWRITE));
   
   g_object_interface_install_property (g_iface,
                                       g_param_spec_boolean ("show-hidden",
                                                             P_("Show Hidden"),
                                                             P_("Whether the hidden files and folders should be displayed"),
                                                             FALSE,
-                                                            G_PARAM_READWRITE));
+                                                            GTK_PARAM_READWRITE));
 }
 
 /**
index dedd2a9fe8d04d745ffe819de5b8ead1ba0ca67c..fbce45911b7c1927181ed363fc8792435f17ac64 100644 (file)
@@ -55,6 +55,7 @@
 #include "gtkfilesystemwin32.h"
 #endif
 
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 /* **************** *
@@ -337,7 +338,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
                                                        P_("Dialog"),
                                                        P_("The file chooser dialog to use."),
                                                        GTK_TYPE_FILE_CHOOSER_DIALOG,
-                                                       (G_PARAM_WRITABLE |
+                                                       (GTK_PARAM_WRITABLE |
                                                         G_PARAM_CONSTRUCT_ONLY)));
 
   /**
@@ -352,7 +353,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
                                                        P_("Title"),
                                                        P_("The title of the file chooser dialog."),
                                                        _(DEFAULT_TITLE),
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkFileChooserButton:width-chars:
@@ -366,7 +367,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
                                                     P_("Width In Characters"),
                                                     P_("The desired width of the button widget, in characters."),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   _gtk_file_chooser_install_properties (gobject_class);
 
index 8e5a45c627de28dd64b15bcd3ec062045182637f..afcfbbb4d92408e8b6b5d50e415f491a729b5f73 100644 (file)
@@ -623,7 +623,7 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
                                                      P_("Default file chooser backend"),
                                                      P_("Name of the GtkFileChooser backend to use by default"),
                                                      NULL,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 }
 
 static void
index c145a22bd8bf0de042cd5ef6d9d7e4c443a5fdf3..fd13b1f57c9cb9137148afb65456c5a30b61a0ca 100644 (file)
@@ -561,23 +561,21 @@ gtk_file_selection_class_init (GtkFileSelectionClass *class)
                                                         P_("Filename"),
                                                         P_("The currently selected filename"),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SHOW_FILEOPS,
                                   g_param_spec_boolean ("show-fileops",
                                                         P_("Show file operations"),
                                                         P_("Whether buttons for creating/manipulating files should be displayed"),
                                                         FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SELECT_MULTIPLE,
                                   g_param_spec_boolean ("select-multiple",
                                                         P_("Select multiple"),
                                                         P_("Whether to allow multiple files to be selected"),
                                                         FALSE,
-                                                        G_PARAM_READABLE |
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   object_class->destroy = gtk_file_selection_destroy;
   widget_class->map = gtk_file_selection_map;
 }
index fb0d88faf481cdeaf9e03d8fc6fd0f8a5451b532..36fabdd2c78277a4ab9e91bf8eea89de5e63640f 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkfixed.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -124,7 +125,7 @@ gtk_fixed_class_init (GtkFixedClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_Y,
@@ -134,7 +135,7 @@ gtk_fixed_class_init (GtkFixedClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 }
 
 static GType
index 2d2615a0daffc21c3e82b67ef8da8a194ec69cb1..3d84acb93caf1f9918f469ac4d75c0692b503c13 100644 (file)
@@ -39,6 +39,7 @@
 #include "gtkfontsel.h"
 #include "gtkimage.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -176,8 +177,8 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                         P_("Title"),
                                                         P_("The title of the font selection dialog"),
                                                         _("Pick a Font"),
-                                                        (G_PARAM_READABLE |
-                                                         G_PARAM_WRITABLE)));
+                                                        (GTK_PARAM_READABLE |
+                                                         GTK_PARAM_WRITABLE)));
 
   /**
    * GtkFontButton:font-name:
@@ -192,8 +193,8 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                         P_("Font name"),
                                                         P_("The name of the selected font"),
                                                         P_("Sans 12"),
-                                                        (G_PARAM_READABLE |
-                                                         G_PARAM_WRITABLE)));
+                                                        (GTK_PARAM_READABLE |
+                                                         GTK_PARAM_WRITABLE)));
 
   /**
    * GtkFontButton:use-font:
@@ -208,8 +209,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                          P_("Use font in label"),
                                                          P_("Whether the label is drawn in the selected font"),
                                                          FALSE,
-                                                         (G_PARAM_READABLE |
-                                                          G_PARAM_WRITABLE)));
+                                                         GTK_PARAM_READWRITE));
 
   /**
    * GtkFontButton:use-size:
@@ -224,8 +224,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                          P_("Use size in label"),
                                                          P_("Whether the label is drawn with the selected font size"),
                                                          FALSE,
-                                                         (G_PARAM_READABLE |
-                                                          G_PARAM_WRITABLE)));
+                                                         GTK_PARAM_READWRITE));
 
   /**
    * GtkFontButton:show-style:
@@ -241,8 +240,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                          P_("Show style"),
                                                          P_("Whether the selected font style is shown in the label"),
                                                          TRUE,
-                                                         (G_PARAM_READABLE |
-                                                          G_PARAM_WRITABLE)));
+                                                         GTK_PARAM_READWRITE));
   /**
    * GtkFontButton:show-size:
    * 
@@ -257,8 +255,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
                                                          P_("Show size"),
                                                          P_("Whether selected font size is shown in the label"),
                                                          TRUE,
-                                                         (G_PARAM_READABLE |
-                                                          G_PARAM_WRITABLE)));
+                                                         GTK_PARAM_READWRITE));
 
   /**
    * GtkFontButton::font-set:
index a9af76e8be9dd5237250f31e4a5493205f4bc208..6e58b220e402b8f70f6f2c57e162578f52dfaaeb 100644 (file)
@@ -58,6 +58,7 @@
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 /* We don't enable the font and style entries because they don't add
@@ -215,21 +216,21 @@ gtk_font_selection_class_init (GtkFontSelectionClass *klass)
                                                         P_("Font name"),
                                                         P_("The X string that represents this font"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_FONT,
                                   g_param_spec_boxed ("font",
                                                       P_("Font"),
                                                       P_("The GdkFont that is currently selected"),
                                                       GDK_TYPE_FONT,
-                                                      G_PARAM_READABLE));
+                                                      GTK_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_PREVIEW_TEXT,
                                    g_param_spec_string ("preview-text",
                                                         P_("Preview text"),
                                                         P_("The text to display in order to demonstrate the selected font"),
                                                         PREVIEW_TEXT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   gobject_class->finalize = gtk_font_selection_finalize;
 }
 
index 0ffd0874c1ba778a240e2d2849185ae598289184..922baead81977b2850470db4354ecfd5ee90adc9 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 #include "gtkframe.h"
 #include "gtklabel.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -127,8 +128,8 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                         P_("Label"),
                                                         P_("Text of the frame's label"),
                                                         NULL,
-                                                        G_PARAM_READABLE |
-                                                       G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READABLE |
+                                                       GTK_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_XALIGN,
                                   g_param_spec_float ("label-xalign",
@@ -137,8 +138,7 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_LABEL_YALIGN,
                                   g_param_spec_float ("label-yalign",
@@ -147,15 +147,14 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READABLE |
-                                                      G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW,
                                    g_param_spec_enum ("shadow", NULL,
                                                       P_("Deprecated property, use shadow_type instead"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_ETCHED_IN,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW_TYPE,
                                    g_param_spec_enum ("shadow-type",
@@ -163,7 +162,7 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                       P_("Appearance of the frame border"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_ETCHED_IN,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_LABEL_WIDGET,
@@ -171,7 +170,7 @@ gtk_frame_class_init (GtkFrameClass *class)
                                                         P_("Label widget"),
                                                         P_("A widget to display in place of the usual frame label"),
                                                         GTK_TYPE_WIDGET,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   widget_class->expose_event = gtk_frame_expose;
   widget_class->size_request = gtk_frame_size_request;
index b4bdd7d3d6f8c9f5558cb69e4eea5daa996a39ff..63bf94a5074fcc7565e43ca7f066c4703764465c 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -200,7 +201,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                       P_("Deprecated property, use shadow_type instead"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_ETCHED_OUT,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW_TYPE,
                                    g_param_spec_enum ("shadow-type",
@@ -208,7 +209,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                       P_("Appearance of the shadow that surrounds the container"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_ETCHED_OUT,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_HANDLE_POSITION,
@@ -217,7 +218,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                       P_("Position of the handle relative to the child widget"),
                                                      GTK_TYPE_POSITION_TYPE,
                                                      GTK_POS_LEFT,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_SNAP_EDGE,
@@ -226,7 +227,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                       P_("Side of the handlebox that's lined up with the docking point to dock the handlebox"),
                                                      GTK_TYPE_POSITION_TYPE,
                                                      GTK_POS_TOP,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SNAP_EDGE_SET,
@@ -234,7 +235,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class)
                                                         P_("Snap edge set"),
                                                         P_("Whether to use the value from the snap_edge property or a value derived from handle_position"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   object_class->destroy = gtk_handle_box_destroy;
 
index b62586f756cc3f3999f90c08ccb46d6565e72cee..fa2fad3e49b345bea6fe5e94ebe2078e7293653b 100644 (file)
@@ -34,6 +34,7 @@
 #include "gtkaccessible.h"
 #include "gtkwindow.h"
 #include "gtktextbuffer.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #undef DEBUG_ICON_VIEW
@@ -336,7 +337,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                      P_("The selection mode"),
                                                      GTK_TYPE_SELECTION_MODE,
                                                      GTK_SELECTION_SINGLE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /**
    * GtkIconView:pixbuf-column:
@@ -354,7 +355,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Pixbuf column"),
                                                     P_("Model column used to retrieve the icon pixbuf from"),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkIconView:text-column:
@@ -372,7 +373,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Text column"),
                                                     P_("Model column used to retrieve the text from"),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   
   /**
@@ -392,7 +393,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Markup column"),
                                                     P_("Model column used to retrieve the text if using Pango markup"),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_MODEL,
@@ -400,7 +401,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                        P_("Icon View Model"),
                                                        P_("The model for the icon view"),
                                                        GTK_TYPE_TREE_MODEL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   /**
    * GtkIconView:columns:
@@ -417,7 +418,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Number of columns"),
                                                     P_("Number of columns to display"),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
 
   /**
@@ -435,7 +436,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Width for each item"),
                                                     P_("The width used for each item"),
                                                     -1, G_MAXINT, -1,
-                                                    G_PARAM_READWRITE));  
+                                                    GTK_PARAM_READWRITE));  
 
   /**
    * GtkIconView::spacing:
@@ -451,7 +452,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Spacing"),
                                                     P_("Space which is inserted between cells of an item"),
                                                     0, G_MAXINT, 0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkIconView::row-spacing:
@@ -467,7 +468,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Row Spacing"),
                                                     P_("Space which is inserted between grid rows"),
                                                     0, G_MAXINT, 6,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkIconView::column-spacing:
@@ -483,7 +484,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Column Spacing"),
                                                     P_("Space which is inserted between grid column"),
                                                     0, G_MAXINT, 6,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkIconView::margin:
@@ -499,7 +500,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                     P_("Margin"),
                                                     P_("Space which is inserted at the edges of the icon view"),
                                                     0, G_MAXINT, 6,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
 
   /**
@@ -517,7 +518,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                      P_("How the text and icon of each item are positioned relative to each other"),
                                                      GTK_TYPE_ORIENTATION,
                                                      GTK_ORIENTATION_VERTICAL,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   /* Style properties */
   gtk_widget_class_install_style_property (widget_class,
@@ -525,7 +526,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                                P_("Selection Box Color"),
                                                                P_("Color of the selection box"),
                                                                GDK_TYPE_COLOR,
-                                                               G_PARAM_READABLE));
+                                                               GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_uchar ("selection-box-alpha",
@@ -533,7 +534,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
                                                                P_("Opacity of the selection box"),
                                                                0, 0xff,
                                                                0x40,
-                                                               G_PARAM_READABLE));
+                                                               GTK_PARAM_READABLE));
 
   /* Signals */
   widget_class->set_scroll_adjustments_signal =
index 87f1f9319a8fe91ff8f58fd44a5f4e6ef7b1ad30..70f926149ad2ac0aaae1c2ed46ae52f6580a2942 100644 (file)
 
 #include <config.h>
 #include <math.h>
+#include <string.h>
+
 #include "gtkcontainer.h"
 #include "gtkimage.h"
 #include "gtkiconfactory.h"
 #include "gtkstock.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
-#include <string.h>
 
 typedef struct _GtkImagePrivate GtkImagePrivate;
 
@@ -158,7 +160,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Pixbuf"),
                                                         P_("A GdkPixbuf to display"),
                                                         GDK_TYPE_PIXBUF,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_PIXMAP,
@@ -166,7 +168,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Pixmap"),
                                                         P_("A GdkPixmap to display"),
                                                         GDK_TYPE_PIXMAP,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_IMAGE,
@@ -174,7 +176,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Image"),
                                                         P_("A GdkImage to display"),
                                                         GDK_TYPE_IMAGE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_MASK,
@@ -182,7 +184,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Mask"),
                                                         P_("Mask bitmap to use with GdkImage or GdkPixmap"),
                                                         GDK_TYPE_PIXMAP,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_FILE,
@@ -190,7 +192,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Filename"),
                                                         P_("Filename to load and display"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
   
 
   g_object_class_install_property (gobject_class,
@@ -199,7 +201,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Stock ID"),
                                                         P_("Stock ID for a stock image to display"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_ICON_SET,
@@ -207,7 +209,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                        P_("Icon set"),
                                                        P_("Icon set to display"),
                                                        GTK_TYPE_ICON_SET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_ICON_SIZE,
@@ -216,7 +218,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                      P_("Symbolic size to use for stock icon, icon set or named icon"),
                                                      0, G_MAXINT,
                                                      DEFAULT_ICON_SIZE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   /**
    * GtkImage:pixel-size:
    *
@@ -233,7 +235,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                     P_("Pixel size to use for named icon"),
                                                     -1, G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_PIXBUF_ANIMATION,
@@ -241,7 +243,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Animation"),
                                                         P_("GdkPixbufAnimation to display"),
                                                         GDK_TYPE_PIXBUF_ANIMATION,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkImage:icon-name:
@@ -257,7 +259,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                         P_("Icon Name"),
                                                         P_("The name of the icon from the icon theme"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_STORAGE_TYPE,
@@ -266,7 +268,7 @@ gtk_image_class_init (GtkImageClass *class)
                                                       P_("The representation being used for image data"),
                                                       GTK_TYPE_IMAGE_TYPE,
                                                       GTK_IMAGE_EMPTY,
-                                                      G_PARAM_READABLE));
+                                                      GTK_PARAM_READABLE));
 
   g_type_class_add_private (object_class, sizeof (GtkImagePrivate));
 }
index 576e4c9ba23518a23fb96212d2e9a252fa364d4a..f53114ddad08132b1b5b722f379bb63fd07a4a6d 100644 (file)
@@ -33,6 +33,7 @@
 #include "gtkimage.h"
 #include "gtkcontainer.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 static void gtk_image_menu_item_class_init           (GtkImageMenuItemClass *klass);
@@ -131,13 +132,13 @@ gtk_image_menu_item_class_init (GtkImageMenuItemClass *klass)
                                                         P_("Image widget"),
                                                         P_("Child widget to appear next to the menu text"),
                                                         GTK_TYPE_WIDGET,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_settings_install_property (g_param_spec_boolean ("gtk-menu-images",
                                                       P_("Show menu images"),
                                                       P_("Whether images should be shown in menus"),
                                                       TRUE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   
 }
 
index dc1f1d2612edc48dd1c3fb8a898b42581b4a7dc6..93e86280dc97214b1a91932f9da3854b26f3b070 100644 (file)
@@ -27,6 +27,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include "gtkinvisible.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -116,7 +117,7 @@ gtk_invisible_class_init (GtkInvisibleClass *class)
                                                        P_("Screen"),
                                                        P_("The screen where this window will be displayed"),
                                                        GDK_TYPE_SCREEN,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 }
 
 static void
index ecfb9682dfa462ed252c258fce43bf72e5fb2347..ffed9b0df3fea3fb433d38c12fecef1240f02ebd 100644 (file)
@@ -41,6 +41,7 @@
 #include "gtknotebook.h"
 #include "gtkstock.h"
 #include "gtkbindings.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
@@ -320,28 +321,28 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Label"),
                                                         P_("The text of the label"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_ATTRIBUTES,
                                   g_param_spec_boxed ("attributes",
                                                       P_("Attributes"),
                                                       P_("A list of style attributes to apply to the text of the label"),
                                                       PANGO_TYPE_ATTR_LIST,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_USE_MARKUP,
                                    g_param_spec_boolean ("use-markup",
                                                         P_("Use markup"),
                                                         P_("The text of the label includes XML markup. See pango_parse_markup()"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_USE_UNDERLINE,
                                    g_param_spec_boolean ("use-underline",
                                                         P_("Use underline"),
                                                         P_("If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_JUSTIFY,
@@ -350,7 +351,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                       P_("The alignment of the lines in the text of the label relative to each other. This does NOT affect the alignment of the label within its allocation. See GtkMisc::xalign for that"),
                                                      GTK_TYPE_JUSTIFICATION,
                                                      GTK_JUSTIFY_LEFT,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_PATTERN,
@@ -358,7 +359,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Pattern"),
                                                         P_("A string with _ characters in positions correspond to characters in the text to underline"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WRAP,
@@ -366,14 +367,14 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Line wrap"),
                                                         P_("If set, wrap lines if the text becomes too wide"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_SELECTABLE,
                                    g_param_spec_boolean ("selectable",
                                                         P_("Selectable"),
                                                         P_("Whether the label text can be selected with the mouse"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_MNEMONIC_KEYVAL,
                                    g_param_spec_uint ("mnemonic-keyval",
@@ -382,7 +383,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      GDK_VoidSymbol,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_MNEMONIC_WIDGET,
                                    g_param_spec_object ("mnemonic-widget",
@@ -390,7 +391,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                        P_("The widget to be activated when the label's mnemonic "
                                                          "key is pressed"),
                                                        GTK_TYPE_WIDGET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_CURSOR_POSITION,
@@ -400,7 +401,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_SELECTION_BOUND,
@@ -410,7 +411,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE));
+                                                     GTK_PARAM_READABLE));
   
   /**
    * GtkLabel:ellipsize:
@@ -434,7 +435,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                       P_("The preferred place to ellipsize the string, if the label does not have enough room to display the entire string, if at all"),
                                                      PANGO_TYPE_ELLIPSIZE_MODE,
                                                      PANGO_ELLIPSIZE_NONE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   /**
    * GtkLabel:width-chars:
@@ -455,7 +456,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   /**
    * GtkLabel:single-line-mode:
@@ -474,7 +475,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                         P_("Single Line Mode"),
                                                         P_("Whether the label is in single line mode"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkLabel:angle:
@@ -494,7 +495,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                        0.0,
                                                        360.0,
                                                        0.0, 
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   /**
    * GtkLabel:max-width-chars:
@@ -515,7 +516,7 @@ gtk_label_class_init (GtkLabelClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   /*
    * Key bindings
    */
index b47ff7f674b050180a5dd352e4d685968a15e2b3..a28bcd2539cfd2651ab3c7eadb732a90521900a5 100644 (file)
@@ -617,7 +617,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_Y,
@@ -627,7 +627,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                                 G_MININT,
                                                                 G_MAXINT,
                                                                 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_HADJUSTMENT,
@@ -635,7 +635,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                        P_("Horizontal adjustment"),
                                                        P_("The GtkAdjustment for the horizontal position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_VADJUSTMENT,
@@ -643,7 +643,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                        P_("Vertical adjustment"),
                                                        P_("The GtkAdjustment for the vertical position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_WIDTH,
@@ -653,7 +653,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     100,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HEIGHT,
                                   g_param_spec_uint ("height",
@@ -662,7 +662,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     100,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   widget_class->realize = gtk_layout_realize;
   widget_class->unrealize = gtk_layout_unrealize;
   widget_class->map = gtk_layout_map;
index 45f35107e9a857bf25139b43f8ab9c768cdfd128..8f4d53726aefe1f25cfea0534e7dfd5ef0f3b9f0 100644 (file)
@@ -268,8 +268,9 @@ gtk_list_class_init (GtkListClass *class)
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   
-  gtk_object_add_arg_type ("GtkList::selection_mode",
-                          GTK_TYPE_SELECTION_MODE, GTK_ARG_READWRITE,
+  gtk_object_add_arg_type ("GtkList::selection-mode",
+                          GTK_TYPE_SELECTION_MODE, 
+                          GTK_ARG_READWRITE | G_PARAM_STATIC_NAME,
                           ARG_SELECTION_MODE);
 }
 
index 36eafd017c77c01b4847a2c852816f8649f7dc24..c4cd80a27a3d2b9c5f80f036a19350cc21650c46 100644 (file)
@@ -42,6 +42,7 @@
 #include "gtkhbox.h"
 #include "gtkvscrollbar.h"
 #include "gtksettings.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -528,7 +529,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                         P_("Tearoff Title"),
                                                         P_("A title that may be displayed by the window manager when this menu is torn-off"),
                                                         "",
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkMenu:tearoff-state:
@@ -543,7 +544,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                         P_("Tearoff State"),
                                                         P_("A boolean that indicates whether the menu is torn-off"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("vertical-padding",
@@ -552,7 +553,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             1,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("vertical-offset",
@@ -561,7 +562,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("horizontal-offset",
@@ -570,7 +571,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             -2,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
 
  gtk_container_class_install_child_property (container_class,
@@ -579,7 +580,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                                P_("Left Attach"),
                                                                P_("The column number to attach the left side of the child to"),
                                                                -1, INT_MAX, -1,
-                                                               G_PARAM_READWRITE));
+                                                               GTK_PARAM_READWRITE));
 
  gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_RIGHT_ATTACH,
@@ -587,7 +588,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                                P_("Right Attach"),
                                                                P_("The column number to attach the right side of the child to"),
                                                                -1, INT_MAX, -1,
-                                                               G_PARAM_READWRITE));
+                                                               GTK_PARAM_READWRITE));
 
  gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TOP_ATTACH,
@@ -595,7 +596,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                                P_("Top Attach"),
                                                                P_("The row number to attach the top of the child to"),
                                                                -1, INT_MAX, -1,
-                                                               G_PARAM_READWRITE));
+                                                               GTK_PARAM_READWRITE));
 
  gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_BOTTOM_ATTACH,
@@ -603,7 +604,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                                P_("Bottom Attach"),
                                                                P_("The row number to attach the bottom of the child to"),
                                                                -1, INT_MAX, -1,
-                                                               G_PARAM_READWRITE));
+                                                               GTK_PARAM_READWRITE));
 
   binding_set = gtk_binding_set_by_class (class);
   gtk_binding_entry_add_signal (binding_set,
@@ -691,7 +692,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                       P_("Can change accelerators"),
                                                       P_("Whether menu accelerators can be changed by pressing a key over the menu item"),
                                                       FALSE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   gtk_settings_install_property (g_param_spec_int ("gtk-menu-popup-delay",
                                                   P_("Delay before submenus appear"),
@@ -699,7 +700,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                   0,
                                                   G_MAXINT,
                                                   DEFAULT_POPUP_DELAY,
-                                                  G_PARAM_READWRITE));
+                                                  GTK_PARAM_READWRITE));
 
   gtk_settings_install_property (g_param_spec_int ("gtk-menu-popdown-delay",
                                                   P_("Delay before hiding a submenu"),
@@ -707,7 +708,7 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                   0,
                                                   G_MAXINT,
                                                   DEFAULT_POPDOWN_DELAY,
-                                                  G_PARAM_READWRITE));
+                                                  GTK_PARAM_READWRITE));
                                                   
 }
 
index 235551c55f6a5129ff8298ece62a9eabe66b2f52..d3b2195fc6981feb26bac8e5f7a0e645902f8910 100644 (file)
@@ -36,6 +36,7 @@
 #include "gtksettings.h"
 #include "gtkintl.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -201,7 +202,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                      P_("The pack direction of the menubar"),
                                                      GTK_TYPE_PACK_DIRECTION,
                                                      GTK_PACK_DIRECTION_LTR,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   /**
    * GtkMenuBar:child-pack-direction:
@@ -218,7 +219,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                      P_("The child pack direction of the menubar"),
                                                      GTK_TYPE_PACK_DIRECTION,
                                                      GTK_PACK_DIRECTION_LTR,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
 
   gtk_widget_class_install_style_property (widget_class,
@@ -227,7 +228,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                               P_("Style of bevel around the menubar"),
                                                               GTK_TYPE_SHADOW_TYPE,
                                                               GTK_SHADOW_OUT,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("internal-padding",
@@ -236,7 +237,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                             0,
                                                             G_MAXINT,
                                                              DEFAULT_IPADDING,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
 
   gtk_settings_install_property (g_param_spec_int ("gtk-menu-bar-popup-delay",
                                                   P_("Delay before drop down menus appear"),
@@ -244,7 +245,7 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                   0,
                                                   G_MAXINT,
                                                   0,
-                                                  G_PARAM_READWRITE));
+                                                  GTK_PARAM_READWRITE));
 
   g_type_class_add_private (gobject_class, sizeof (GtkMenuBarPrivate));  
 }
index b867b3af9658a7556e244be057c3dc267d9c8198..2073ca6f0c15135b63b3812e6ada43dde5e3f081 100644 (file)
@@ -36,6 +36,7 @@
 #include "gtkmenubar.h"
 #include "gtkmenuitem.h"
 #include "gtkseparatormenuitem.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define MENU_ITEM_CLASS(w)  GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass)
@@ -210,7 +211,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                                     "Shadow type when item is selected",
                                                                     GTK_TYPE_SHADOW_TYPE,
                                                                     GTK_SHADOW_NONE,
-                                                                    G_PARAM_READABLE),
+                                                                    GTK_PARAM_READABLE),
                                                  gtk_rc_property_parse_enum);
 
   gtk_widget_class_install_style_property (widget_class,
@@ -220,7 +221,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                             3,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("toggle-spacing",
@@ -229,7 +230,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                             5,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("arrow-spacing",
@@ -238,7 +239,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                             10,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 }
 
 static void
index 745127a32608a171ff51894b0c1a449f07eeb1b9..7ef15de35a81457de19543f652adbd78475bbb58 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkvbox.h"
 #include "gtkmenu.h"
 #include "gtkmain.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -247,7 +248,7 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass)
                                                         P_("Menu"),
                                                         P_("The dropdown menu"),
                                                         GTK_TYPE_MENU,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_type_class_add_private (object_class, sizeof (GtkMenuToolButtonPrivate));
 }
index ca5ad21c74f90b01486dec3dc2785f4bc373c83b..f717418987c329319cefa61896d6e2677e8b9393 100644 (file)
@@ -26,6 +26,8 @@
  */
 
 #include <config.h>
+#include <string.h>
+
 #include "gtkmessagedialog.h"
 #include "gtklabel.h"
 #include "gtkhbox.h"
@@ -34,7 +36,7 @@
 #include "gtkstock.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
-#include <string.h>
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define GTK_MESSAGE_DIALOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MESSAGE_DIALOG, GtkMessageDialogPrivate))
@@ -126,7 +128,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              12,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
   /**
    * GtkMessageDialog::use_separator
    *
@@ -140,7 +142,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
                                                                 P_("Use separator"),
                                                                 P_("Whether to put a separator between the message dialog's text and the buttons"),
                                                                 FALSE,
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_MESSAGE_TYPE,
                                    g_param_spec_enum ("message-type",
@@ -148,7 +150,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
                                                      P_("The type of message"),
                                                      GTK_TYPE_MESSAGE_TYPE,
                                                       GTK_MESSAGE_INFO,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+                                                      GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (gobject_class,
                                    PROP_BUTTONS,
                                    g_param_spec_enum ("buttons",
@@ -156,7 +158,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
                                                      P_("The buttons shown in the message dialog"),
                                                      GTK_TYPE_BUTTONS_TYPE,
                                                       GTK_BUTTONS_NONE,
-                                                      G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+                                                      GTK_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
   g_type_class_add_private (gobject_class,
                            sizeof (GtkMessageDialogPrivate));
 }
index 7abb87337e6d217d5257b5172c0af061037e5da5..bc06f8a0a5acfdd4003e6727a0b2a49eaf60308b 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkcontainer.h"
 #include "gtkmisc.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -102,7 +103,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YALIGN,
@@ -112,7 +113,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_XPAD,
@@ -122,7 +123,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_YPAD,
@@ -132,7 +133,7 @@ gtk_misc_class_init (GtkMiscClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 }
 
 static void
index 9a825de359dbb7d9bcbada6eedad0ef075829bdb..87e391ce9fffc1b1129c5490439237fa2abe15d3 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -403,7 +404,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_TAB_POS,
                                   g_param_spec_enum ("tab-pos",
@@ -411,7 +412,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                      P_("Which side of the notebook holds the tabs"),
                                                      GTK_TYPE_POSITION_TYPE,
                                                      GTK_POS_TOP,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_TAB_BORDER,
                                   g_param_spec_uint ("tab-border",
@@ -420,7 +421,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      2,
-                                                     G_PARAM_WRITABLE));
+                                                     GTK_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_TAB_HBORDER,
                                   g_param_spec_uint ("tab-hborder",
@@ -429,7 +430,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      2,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_TAB_VBORDER,
                                   g_param_spec_uint ("tab-vborder",
@@ -438,42 +439,42 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                      0,
                                                      G_MAXUINT,
                                                      2,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SHOW_TABS,
                                   g_param_spec_boolean ("show-tabs",
                                                         P_("Show Tabs"),
                                                         P_("Whether tabs should be shown or not"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SHOW_BORDER,
                                   g_param_spec_boolean ("show-border",
                                                         P_("Show Border"),
                                                         P_("Whether the border should be shown or not"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SCROLLABLE,
                                   g_param_spec_boolean ("scrollable",
                                                         P_("Scrollable"),
                                                         P_("If TRUE, scroll arrows are added if there are too many tabs to fit"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_ENABLE_POPUP,
                                   g_param_spec_boolean ("enable-popup",
                                                         P_("Enable Popup"),
                                                         P_("If TRUE, pressing the right mouse button on the notebook pops up a menu that you can use to go to a page"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HOMOGENEOUS,
                                   g_param_spec_boolean ("homogeneous",
                                                         P_("Homogeneous"),
                                                         P_("Whether tabs should have homogeneous sizes"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TAB_LABEL,
@@ -481,42 +482,42 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                   P_("Tab label"),
                                                                   P_("The string displayed on the child's tab label"),
                                                                   NULL,
-                                                                  G_PARAM_READWRITE));
+                                                                  GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_MENU_LABEL,
                                              g_param_spec_string ("menu-label", 
                                                                   P_("Menu label"), 
                                                                   P_("The string displayed in the child's menu entry"),
                                                                   NULL,
-                                                                  G_PARAM_READWRITE));
+                                                                  GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_POSITION,
                                              g_param_spec_int ("position", 
                                                                P_("Position"), 
                                                                P_("The index of the child in the parent"),
                                                                -1, G_MAXINT, 0,
-                                                               G_PARAM_READWRITE));
+                                                               GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TAB_EXPAND,
                                              g_param_spec_boolean ("tab-expand", 
                                                                    P_("Tab expand"), 
                                                                    P_("Whether to expand the child's tab or not"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TAB_FILL,
                                              g_param_spec_boolean ("tab-fill", 
                                                                    P_("Tab fill"), 
                                                                    P_("Whether the child's tab should fill the allocated area or not"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TAB_PACK,
                                              g_param_spec_enum ("tab-pack", 
                                                                 P_("Tab pack type"),
                                                                 P_("A GtkPackType indicating whether the child is packed with reference to the start or end of the parent"),
                                                                 GTK_TYPE_PACK_TYPE, GTK_PACK_START,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 
 /**
  * GtkNotebook:has-secondary-backward-stepper:
@@ -533,7 +534,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                 P_("Display a second backward arrow button on the opposite end of the tab area"),
                                                                 FALSE,
                                                                 
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
 
 /**
  * GtkNotebook:has-secondary-forward-stepper:
@@ -550,7 +551,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                 P_("Display a second forward arrow button on the opposite end of the tab area"),
                                                                 FALSE,
                                                                 
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
 
 /**
  * GtkNotebook:has-backward-stepper:
@@ -566,7 +567,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                 P_("Display the standard backward arrow button"),
                                                                 TRUE,
                                                                 
-                                                                   G_PARAM_READABLE));
+                                                                   GTK_PARAM_READABLE));
 
 /**
  * GtkNotebook:has-forward-stepper:
@@ -582,7 +583,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                 P_("Display the standard forward arrow button"),
                                                                 TRUE,
                                                                 
-                                                                   G_PARAM_READABLE));
+                                                                   GTK_PARAM_READABLE));
 
   notebook_signals[SWITCH_PAGE] =
     g_signal_new ("switch_page",
index e2e2b733e655bb3cfc87ecbc1c265cf93ad429f9..38fe2000624bc224a1ba47c1be347ebfa6d9af51 100644 (file)
@@ -31,6 +31,7 @@
 #include "gtkobject.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -228,7 +229,7 @@ gtk_object_add_arg_type (const gchar *arg_name,
     g_return_if_fail ((arg_flags & G_PARAM_CONSTRUCT_ONLY) == 0);
   if (arg_flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
     g_return_if_fail (arg_flags & G_PARAM_WRITABLE);
-  g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) == 0);
+  g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME)) == 0);
 
   pname = strchr (arg_name, ':');
   g_return_if_fail (pname && pname[1] == ':');
@@ -330,7 +331,7 @@ gtk_object_class_init (GtkObjectClass *class)
                                   PROP_USER_DATA,
                                   g_param_spec_pointer ("user-data", "User Data",
                                                         "Anonymous User Data Pointer",
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   object_signals[DESTROY] =
     g_signal_new ("destroy",
                  G_TYPE_FROM_CLASS (gobject_class),
index 24598c8bf361d3996b87eb9b1cae6e5faf8bedda..8540137fcdd99ed1aa9656a5001ed7b6c2c199f7 100644 (file)
@@ -324,8 +324,8 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    _gtk_marshal_NONE__NONE,
                    GTK_TYPE_NONE, 0);
 
-  gtk_object_add_arg_type ("GtkOldEditable::text-position", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_TEXT_POSITION);
-  gtk_object_add_arg_type ("GtkOldEditable::editable", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EDITABLE);
+  gtk_object_add_arg_type ("GtkOldEditable::text-position", GTK_TYPE_INT, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_TEXT_POSITION);
+  gtk_object_add_arg_type ("GtkOldEditable::editable", GTK_TYPE_BOOL, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_EDITABLE);
 }
 
 static void
index fb4dd65a4d33b81a18726734b6c5b067f3eff875..feb62717ab63fd883db3d83dd87808716210c092 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtkoptionmenu.h"
 #define GTK_DISABLE_DEPRECATED
 
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define CHILD_LEFT_SPACING        4
@@ -195,20 +196,20 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class)
                                                         P_("Menu"),
                                                         P_("The menu of options"),
                                                         GTK_TYPE_MENU,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boxed ("indicator-size",
                                                               P_("Indicator Size"),
                                                               P_("Size of dropdown indicator"),
                                                               GTK_TYPE_REQUISITION,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boxed ("indicator-spacing",
                                                               P_("Indicator Spacing"),
                                                               P_("Spacing around indicator"),
                                                               GTK_TYPE_BORDER,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 }
 
 static GType
index 8e22df9e2c5e05524da633a7c4200d2a2b344ba7..4754ab317a8132ffe762683343b1ff83ddee3113 100644 (file)
@@ -33,6 +33,7 @@
 #include "gtkwindow.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 enum {
@@ -242,14 +243,14 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_POSITION_SET,
                                   g_param_spec_boolean ("position-set",
                                                         P_("Position Set"),
                                                         P_("TRUE if the Position property should be used"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
                                   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("handle-size",
@@ -258,7 +259,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             5,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   /**
    * GtkPaned:min-position:
    *
@@ -275,7 +276,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READABLE));
+                                                    GTK_PARAM_READABLE));
 
   /**
    * GtkPaned:max-position:
@@ -293,7 +294,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     G_MAXINT,
-                                                    G_PARAM_READABLE));
+                                                    GTK_PARAM_READABLE));
 
 /**
  * GtkPaned:resize:
@@ -309,7 +310,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                                    P_("Resize"),
                                                                    P_("If TRUE, the child expands and shrinks along with the paned widget"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
 
 /**
  * GtkPaned:shrink:
@@ -325,7 +326,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                                    P_("Shrink"),
                                                                    P_("If TRUE, the child can be made smaller than its requisition"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
 
   signals [CYCLE_CHILD_FOCUS] =
     g_signal_new ("cycle_child_focus",
index c26d463565f982e25a7b58810a0ee69e288e0f71..683d21cd83345f69f0d7a66bc3f5828a20f2fca3 100644 (file)
@@ -38,6 +38,7 @@
 #include "gdk/gdkrgb.h"
 #include "gtkpreview.h"
 #include "gtksignal.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -133,7 +134,7 @@ gtk_preview_class_init (GtkPreviewClass *klass)
                                                         P_("Expand"),
                                                         P_("Whether the preview widget should take up the entire space it is allocated"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 }
 
 static void
index 390c4f1b6180652083726b0eff842a26b7d5b0d9..690cc8a34f80802870408fc3c9346156707f1184 100644 (file)
 #include <gtk/gtkwidget.h>
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
 
 /* The private flags that are used in the private_flags member of GtkWidget.
  */
@@ -103,8 +100,10 @@ gboolean _gtk_fnmatch (const char *pattern,
                       const char *string,
                       gboolean    no_leading_period);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#define GTK_PARAM_READABLE G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_WRITABLE G_PARAM_WRITABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#define GTK_PARAM_READWRITE G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+
+G_END_DECLS
 
 #endif /* __GTK_PRIVATE_H__ */
index 093816d317ef62e12dc4d4cfdea21697682d901c..4a6b819f483a5e9d03de3cf55463400101ebddce 100644 (file)
@@ -29,6 +29,7 @@
 #include <math.h>
 #include <string.h>
 #include "gtkprogress.h" 
+#include "gtkprivate.h" 
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -131,7 +132,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                                         P_("Activity mode"),
                                                         P_("If TRUE the GtkProgress is in activity mode, meaning that it signals something is happening, but not how much of the activity is finished. This is used when you're doing something that you don't know how long it will take"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_TEXT,
@@ -139,7 +140,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                                         P_("Show text"),
                                                         P_("Whether the progress is shown as text"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_TEXT_XALIGN,
@@ -149,7 +150,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));  
+                                                      GTK_PARAM_READWRITE));  
     g_object_class_install_property (gobject_class,
                                   PROP_TEXT_YALIGN,
                                   g_param_spec_float ("text-yalign",
@@ -158,7 +159,7 @@ gtk_progress_class_init (GtkProgressClass *class)
                                                       0.0,
                                                       1.0,
                                                       0.5,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 }
 
 static void
index 03ca701aa0c665d54bdc2ecb0a976f1f076e6208..0979f3a693fd201947212bbac6f6029e20e5ae3d 100644 (file)
@@ -35,6 +35,7 @@
 #endif
 
 #include "gtkprogressbar.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -144,7 +145,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                         P_("Adjustment"),
                                                         P_("The GtkAdjustment connected to the progress bar (Deprecated)"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ORIENTATION,
@@ -153,7 +154,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                      P_("Orientation and growth direction of the progress bar"),
                                                      GTK_TYPE_PROGRESS_BAR_ORIENTATION,
                                                      GTK_PROGRESS_LEFT_TO_RIGHT,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_BAR_STYLE,
@@ -162,7 +163,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                      P_("Specifies the visual style of the bar in percentage mode (Deprecated)"),
                                                      GTK_TYPE_PROGRESS_BAR_STYLE,
                                                      GTK_PROGRESS_CONTINUOUS,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ACTIVITY_STEP,
@@ -172,7 +173,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                      -G_MAXUINT,
                                                      G_MAXUINT,
                                                      3,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ACTIVITY_BLOCKS,
@@ -182,7 +183,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                      2,
                                                      G_MAXUINT,
                                                      5,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_DISCRETE_BLOCKS,
@@ -192,7 +193,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                      2,
                                                      G_MAXUINT,
                                                      10,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_FRACTION,
@@ -202,7 +203,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                        0.0,
                                                        1.0,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
   
   g_object_class_install_property (gobject_class,
                                   PROP_PULSE_STEP,
@@ -212,7 +213,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                        0.0,
                                                        1.0,
                                                        0.1,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
   
   g_object_class_install_property (gobject_class,
                                   PROP_TEXT,
@@ -220,7 +221,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                        P_("Text"),
                                                        P_("Text to be displayed in the progress bar"),
                                                        "%P %%",
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   /**
    * GtkProgressBar:ellipsize:
@@ -243,7 +244,7 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
                                                       P_("The preferred place to ellipsize the string, if the progressbar does not have enough room to display the entire string, if at all"),
                                                      PANGO_TYPE_ELLIPSIZE_MODE,
                                                      PANGO_ELLIPSIZE_NONE,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
 }
 
index ad078df2e139e45865bf127434487cb0641e5442..815dc4f2549289b7f53f29778f7ce2cdbfdb213e 100644 (file)
@@ -35,6 +35,7 @@
 #include "gtktoggleactionprivate.h"
 #include "gtktoggletoolbutton.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define GTK_RADIO_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_RADIO_ACTION, GtkRadioActionPrivate))
@@ -141,7 +142,7 @@ gtk_radio_action_class_init (GtkRadioActionClass *klass)
                                                     G_MININT,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   /**
    * GtkRadioAction:group:
@@ -156,7 +157,7 @@ gtk_radio_action_class_init (GtkRadioActionClass *klass)
                                                        P_("Group"),
                                                        P_("The radio action whose group this action belongs to."),
                                                        GTK_TYPE_RADIO_ACTION,
-                                                       G_PARAM_WRITABLE));
+                                                       GTK_PARAM_WRITABLE));
 
   /**
    * GtkRadioAction::changed:
index b33b9085497a1d4fc38db9e96d44f07f9448c797..3b3a61ac887536b449f2fc72a95f9e926165d4bb 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkradiobutton.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -113,7 +114,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
                                                        P_("Group"),
                                                        P_("The radio button whose group this widget belongs to."),
                                                        GTK_TYPE_RADIO_BUTTON,
-                                                       G_PARAM_WRITABLE));
+                                                       GTK_PARAM_WRITABLE));
   object_class->destroy = gtk_radio_button_destroy;
 
   widget_class->focus = gtk_radio_button_focus;
index cd6a756878e1b311a27ae391b53a1d8114a68f6c..f5c52f741298863cf05cc22f7c33fa52a76fac29 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtkradiotoolbutton.h"
 #include "gtkradiobutton.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 enum {
@@ -91,7 +92,7 @@ gtk_radio_tool_button_class_init (GtkRadioToolButtonClass *klass)
                                                        _("Group"),
                                                        _("The radio tool button whose group this button belongs to."),
                                                        GTK_TYPE_RADIO_TOOL_BUTTON,
-                                                       G_PARAM_WRITABLE));
+                                                       GTK_PARAM_WRITABLE));
 
 }
 
index 47052c8e7d117db5331c4c0baa4a3972521e20ee..4be87a6b813e8c9339e2644969fa0c650a576b5f 100644 (file)
@@ -34,6 +34,7 @@
 #include "gtkrange.h"
 #include "gtkintl.h"
 #include "gtkscrollbar.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
@@ -326,7 +327,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                      P_("How the range should be updated on the screen"),
                                                      GTK_TYPE_UPDATE_TYPE,
                                                      GTK_UPDATE_CONTINUOUS,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_ADJUSTMENT,
@@ -334,7 +335,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                        P_("Adjustment"),
                                                        P_("The GtkAdjustment that contains the current value of this range object"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                    PROP_INVERTED,
@@ -342,7 +343,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                        P_("Inverted"),
                                                        P_("Invert direction slider moves to increase range value"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("slider-width",
@@ -351,7 +352,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             14,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("trough-border",
                                                              P_("Trough Border"),
@@ -359,7 +360,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                              0,
                                                              G_MAXINT,
                                                              1,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("stepper-size",
                                                             P_("Stepper Size"),
@@ -367,7 +368,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             14,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("stepper-spacing",
                                                             P_("Stepper Spacing"),
@@ -375,7 +376,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                              0,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("arrow-displacement-x",
                                                             P_("Arrow X Displacement"),
@@ -383,7 +384,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("arrow-displacement-y",
                                                             P_("Arrow Y Displacement"),
@@ -391,7 +392,7 @@ gtk_range_class_init (GtkRangeClass *class)
                                                             G_MININT,
                                                             G_MAXINT,
                                                             0,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 }
 
 static void
index 161c2b4113ea4aed652d7be2d082e857be06414d..779718aeba98c67f32e6eb1059c3da74ad7f6da6 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkruler.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -122,7 +123,7 @@ gtk_ruler_class_init (GtkRulerClass *class)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (gobject_class,
                                    PROP_UPPER,
@@ -132,7 +133,7 @@ gtk_ruler_class_init (GtkRulerClass *class)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (gobject_class,
                                    PROP_POSITION,
@@ -142,7 +143,7 @@ gtk_ruler_class_init (GtkRulerClass *class)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (gobject_class,
                                    PROP_MAX_SIZE,
@@ -152,7 +153,7 @@ gtk_ruler_class_init (GtkRulerClass *class)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
 }
 
 static void
index fcded4b24ce4c8bea026c2bca89cb939d6b123ee..a28bea7403d40a2aa5436b96391f2487349c2f96 100644 (file)
@@ -32,6 +32,7 @@
 #include "gtkmarshalers.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkbindings.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 
@@ -174,7 +175,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                                                     -1,
                                                     MAX_DIGITS,
                                                     1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DRAW_VALUE,
@@ -182,7 +183,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                                                         P_("Draw Value"),
                                                         P_("Whether the current value is displayed as a string next to the slider"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_VALUE_POS,
@@ -191,7 +192,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                                                      P_("The position in which the current value is displayed"),
                                                      GTK_TYPE_POSITION_TYPE,
                                                      GTK_POS_LEFT,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("slider-length",
@@ -200,7 +201,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             31,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("value-spacing",
@@ -209,7 +210,7 @@ gtk_scale_class_init (GtkScaleClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             2,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   
   /* All bindings (even arrow keys) are on both h/v scale, because
    * blind users etc. don't care about scale orientation.
index a7bfcaefb53c7b74a26d31923a26d1ef2b0ffd52..226f675ddef5d9da876498d35414a561a743f9fc 100644 (file)
@@ -28,6 +28,7 @@
 #include <config.h>
 #include "gtkscrollbar.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 static void gtk_scrollbar_class_init (GtkScrollbarClass *klass);
@@ -84,7 +85,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             21,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boolean ("fixed-slider-length",
@@ -92,7 +93,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                  P_("Don't change slider size, just lock it to the minimum length"),
                                                                  FALSE,
                                                                  
-                                                                 G_PARAM_READABLE));
+                                                                 GTK_PARAM_READABLE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boolean ("has-backward-stepper",
@@ -100,7 +101,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                  P_("Display the standard backward arrow button"),
                                                                  TRUE,
                                                                  
-                                                                 G_PARAM_READABLE));
+                                                                 GTK_PARAM_READABLE));
 
     gtk_widget_class_install_style_property (widget_class,
                                              g_param_spec_boolean ("has-forward-stepper",
@@ -108,7 +109,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                    P_("Display the standard forward arrow button"),
                                                                    TRUE,
                                                                    
-                                                                   G_PARAM_READABLE));
+                                                                   GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boolean ("has-secondary-backward-stepper",
@@ -116,7 +117,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                  P_("Display a second backward arrow button on the opposite end of the scrollbar"),
                                                                  FALSE,
                                                                  
-                                                                 G_PARAM_READABLE));
+                                                                 GTK_PARAM_READABLE));
 
     gtk_widget_class_install_style_property (widget_class,
                                              g_param_spec_boolean ("has-secondary-forward-stepper",
@@ -124,7 +125,7 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
                                                                    P_("Display a secondary forward arrow button on the opposite end of the scrollbar"),
                                                                    FALSE,
                                                                    
-                                                                   G_PARAM_READABLE));
+                                                                   GTK_PARAM_READABLE));
 }
 
 static void
index 36e385d0d2ad192476534136c0110134a37bae57..7618b2a018c9922872e34bb00a7e02e4271f88cf 100644 (file)
@@ -30,6 +30,7 @@
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkscrolledwindow.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -238,14 +239,14 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                        P_("Horizontal Adjustment"),
                                                        P_("The GtkAdjustment for the horizontal position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (gobject_class,
                                   PROP_VADJUSTMENT,
                                   g_param_spec_object ("vadjustment",
                                                        P_("Vertical Adjustment"),
                                                        P_("The GtkAdjustment for the vertical position"),
                                                        GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (gobject_class,
                                    PROP_HSCROLLBAR_POLICY,
                                    g_param_spec_enum ("hscrollbar-policy",
@@ -253,7 +254,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                       P_("When the horizontal scrollbar is displayed"),
                                                      GTK_TYPE_POLICY_TYPE,
                                                      GTK_POLICY_ALWAYS,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READABLE | GTK_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_VSCROLLBAR_POLICY,
                                    g_param_spec_enum ("vscrollbar-policy",
@@ -261,7 +262,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                       P_("When the vertical scrollbar is displayed"),
                                                      GTK_TYPE_POLICY_TYPE,
                                                      GTK_POLICY_ALWAYS,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READABLE | GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WINDOW_PLACEMENT,
@@ -270,7 +271,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                       P_("Where the contents are located with respect to the scrollbars"),
                                                      GTK_TYPE_CORNER_TYPE,
                                                      GTK_CORNER_TOP_LEFT,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READABLE | GTK_PARAM_WRITABLE));
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW_TYPE,
                                    g_param_spec_enum ("shadow-type",
@@ -278,7 +279,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                       P_("Style of bevel around the contents"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_NONE,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READABLE | GTK_PARAM_WRITABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("scrollbar-spacing",
@@ -287,7 +288,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             DEFAULT_SCROLLBAR_SPACING,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   signals[SCROLL_CHILD] =
     g_signal_new ("scroll_child",
index afeaf0fe9f2d3b8461fdb251379d6e790758b022..fd56650dd559ab3923a4a95fb225f9e8b4a84f93 100644 (file)
@@ -26,6 +26,7 @@
 #include "gtkseparatortoolitem.h"
 #include "gtkintl.h"
 #include "gtktoolbar.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define MENU_ID "gtk-separator-tool-item-menu-id"
@@ -136,7 +137,7 @@ gtk_separator_tool_item_class_init (GtkSeparatorToolItemClass *class)
                                                         P_("Draw"),
                                                         P_("Whether the separator is drawn, or just blank"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_type_class_add_private (object_class, sizeof (GtkSeparatorToolItemPrivate));
 }
index 8207cc3cdf51d5104c688ce80e7ff61513751a15..dd00053e9c4f14d7ab4a51341d05a196a2b101bf 100644 (file)
@@ -22,6 +22,7 @@
 #include "gtkrc.h"
 #include "gtkintl.h"
 #include "gtkwidget.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
@@ -270,7 +271,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                P_("Double Click Time"),
                                                                P_("Maximum time allowed between two clicks for them to be considered a double click (in milliseconds)"),
                                                                0, G_MAXINT, 250,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_DOUBLE_CLICK_TIME);
   result = settings_install_property_parser (class,
@@ -278,7 +279,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                P_("Double Click Distance"),
                                                                P_("Maximum distance allowed between two clicks for them to be considered a double click (in pixels)"),
                                                                0, G_MAXINT, 5,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_DOUBLE_CLICK_DISTANCE);
   result = settings_install_property_parser (class,
@@ -286,7 +287,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Cursor Blink"),
                                                                   P_("Whether the cursor should blink"),
                                                                   TRUE,
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                             NULL);
   g_assert (result == PROP_CURSOR_BLINK);
   result = settings_install_property_parser (class,
@@ -294,7 +295,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                P_("Cursor Blink Time"),
                                                                P_("Length of the cursor blink cycle, in milleseconds"),
                                                                100, G_MAXINT, 1200,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_CURSOR_BLINK_TIME);
   result = settings_install_property_parser (class,
@@ -302,7 +303,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Split Cursor"),
                                                                   P_("Whether two cursors should be displayed for mixed left-to-right and right-to-left text"),
                                                                   TRUE,
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_SPLIT_CURSOR);
   result = settings_install_property_parser (class,
@@ -310,7 +311,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Theme Name"),
                                                                   P_("Name of theme RC file to load"),
                                                                  "Default",
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_THEME_NAME);
   result = settings_install_property_parser (class,
@@ -318,7 +319,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                  P_("Icon Theme Name"),
                                                                  P_("Name of icon theme to use"),
                                                                  "hicolor",
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ICON_THEME_NAME);
   
@@ -327,7 +328,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                  P_("Key Theme Name"),
                                                                  P_("Name of key theme RC file to load"),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_KEY_THEME_NAME);    
 
@@ -336,7 +337,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Menu bar accelerator"),
                                                                   P_("Keybinding to activate the menu bar"),
                                                                   "F10",
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_MENU_BAR_ACCEL);
 
@@ -345,7 +346,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                               P_("Drag threshold"),
                                                               P_("Number of pixels the cursor can move before dragging"),
                                                               1, G_MAXINT, 8,
-                                                               G_PARAM_READWRITE),
+                                                               GTK_PARAM_READWRITE),
                                             NULL);
   g_assert (result == PROP_DND_DRAG_THRESHOLD);
 
@@ -354,7 +355,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Font Name"),
                                                                   P_("Name of default font to use"),
                                                                  "Sans 10",
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_FONT_NAME);
 
@@ -363,7 +364,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Icon Sizes"),
                                                                   P_("List of icon sizes (gtk-menu=16,16;gtk-button=20,20..."),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ICON_SIZES);
 
@@ -372,7 +373,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                  P_("GTK Modules"),
                                                                  P_("List of currently active GTK modules"),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_MODULES);
 
@@ -382,7 +383,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                               P_("Xft Antialias"),
                                                               P_("Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"),
                                                               -1, 1, -1,
-                                                              G_PARAM_READWRITE),
+                                                              GTK_PARAM_READWRITE),
                                             NULL);
  
   g_assert (result == PROP_XFT_ANTIALIAS);
@@ -392,7 +393,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                               P_("Xft Hinting"),
                                                               P_("Whether to hint Xft fonts; 0=no, 1=yes, -1=default"),
                                                               -1, 1, -1,
-                                                              G_PARAM_READWRITE),
+                                                              GTK_PARAM_READWRITE),
                                             NULL);
   
   g_assert (result == PROP_XFT_HINTING);
@@ -402,7 +403,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                  P_("Xft Hint Style"),
                                                                  P_("What degree of hinting to use; none, slight, medium, or full"),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                               NULL);
   
   g_assert (result == PROP_XFT_HINTSTYLE);
@@ -412,7 +413,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                  P_("Xft RGBA"),
                                                                  P_("Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"),
                                                                  NULL,
-                                                                 G_PARAM_READWRITE),
+                                                                 GTK_PARAM_READWRITE),
                                             NULL);
   
   g_assert (result == PROP_XFT_RGBA);
@@ -422,7 +423,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                               P_("Xft DPI"),
                                                               P_("Resolution for Xft, in 1024 * dots/inch. -1 to use default value"),
                                                               -1, 1024*1024, -1,
-                                                              G_PARAM_READWRITE),
+                                                              GTK_PARAM_READWRITE),
                                             NULL);
   
   g_assert (result == PROP_XFT_DPI);
@@ -432,7 +433,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
                                                                   P_("Alternative button order"),
                                                                   P_("Whether buttons in dialogs should use the alternative button order"),
                                                                   FALSE,
-                                                                  G_PARAM_READWRITE),
+                                                                  GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ALTERNATIVE_BUTTON_ORDER);
 }
index ca6cc5d38c7206dda5f9dbe7877b3cbf7dbf758f..5d62d181e0859718463bc6208d26bb73e50c82fd 100644 (file)
@@ -245,7 +245,7 @@ gtk_size_group_class_init (GtkSizeGroupClass *klass)
                                                        " of its component widgets"),
                                                      GTK_TYPE_SIZE_GROUP_MODE,
                                                      GTK_SIZE_GROUP_HORIZONTAL,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 }
 
 static void
index fe6a435b1b4606449e44cbe183bf41102331d891..7b263746a2120e59d000a81acc2e94a425b6e213 100644 (file)
@@ -39,6 +39,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtksettings.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -242,7 +243,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                         P_("Adjustment"),
                                                         P_("The adjustment that holds the value of the spinbutton"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_CLIMB_RATE,
@@ -252,7 +253,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                        0.0,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
   
   g_object_class_install_property (gobject_class,
                                    PROP_DIGITS,
@@ -262,7 +263,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                      0,
                                                      MAX_DIGITS,
                                                      0,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_SNAP_TO_TICKS,
@@ -270,7 +271,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                         P_("Snap to Ticks"),
                                                         P_("Whether erroneous values are automatically changed to a spin button's nearest step increment"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_NUMERIC,
@@ -278,7 +279,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                         P_("Numeric"),
                                                         P_("Whether non-numeric characters should be ignored"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_WRAP,
@@ -286,7 +287,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                         P_("Wrap"),
                                                         P_("Whether a spin button should wrap upon reaching its limits"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_UPDATE_POLICY,
@@ -295,7 +296,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                      P_("Whether the spin button should update always, or only when the value is legal"),
                                                      GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY,
                                                      GTK_UPDATE_ALWAYS,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_VALUE,
@@ -305,7 +306,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                        -G_MAXDOUBLE,
                                                        G_MAXDOUBLE,
                                                        0.0,
-                                                       G_PARAM_READWRITE));  
+                                                       GTK_PARAM_READWRITE));  
   
   gtk_widget_class_install_style_property_parser (widget_class,
                                                  g_param_spec_enum ("shadow-type", 
@@ -313,7 +314,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                                     P_("Style of bevel around the spin button"),
                                                                     GTK_TYPE_SHADOW_TYPE,
                                                                     GTK_SHADOW_IN,
-                                                                    G_PARAM_READABLE),
+                                                                    GTK_PARAM_READABLE),
                                                  gtk_rc_property_parse_enum);
   spinbutton_signals[INPUT] =
     g_signal_new ("input",
index 407b658f21573d8446a9695d0e8bee470cff785a..36cd3625b158b2c82575ff8199f4edfb0c2069e3 100644 (file)
@@ -31,6 +31,7 @@
 #include "gtkmarshalers.h"
 #include "gtkstatusbar.h"
 #include "gtkwindow.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -177,7 +178,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                                                         P_("Has Resize Grip"),
                                                         P_("Whether the statusbar has a grip for resizing the toplevel"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   statusbar_signals[SIGNAL_TEXT_PUSHED] =
     g_signal_new ("text_pushed",
                  G_OBJECT_CLASS_TYPE (class),
@@ -205,7 +206,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                                                               P_("Style of bevel around the statusbar text"),
                                                               GTK_TYPE_SHADOW_TYPE,
                                                               GTK_SHADOW_IN,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 }
 
 static void
index 308a88ee93a15fd71a4082b1b05252a838c979d3..2cb4474a27afcfceb6bfb3022300d2173d959c9d 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtktable.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -162,7 +163,7 @@ gtk_table_class_init (GtkTableClass *class)
                                                     0,
                                                     G_MAXUINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_N_COLUMNS,
                                    g_param_spec_uint ("n-columns",
@@ -171,7 +172,7 @@ gtk_table_class_init (GtkTableClass *class)
                                                     0,
                                                     G_MAXUINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_ROW_SPACING,
                                    g_param_spec_uint ("row-spacing",
@@ -180,7 +181,7 @@ gtk_table_class_init (GtkTableClass *class)
                                                     0,
                                                     G_MAXUINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_COLUMN_SPACING,
                                    g_param_spec_uint ("column-spacing",
@@ -189,14 +190,14 @@ gtk_table_class_init (GtkTableClass *class)
                                                     0,
                                                     G_MAXUINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                    PROP_HOMOGENEOUS,
                                    g_param_spec_boolean ("homogeneous",
                                                         P_("Homogenous"),
                                                         P_("If TRUE this means the table cells are all the same width/height"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_LEFT_ATTACH,
@@ -204,56 +205,56 @@ gtk_table_class_init (GtkTableClass *class)
                                                                 P_("Left attachment"), 
                                                                 P_("The column number to attach the left side of the child to"),
                                                                 0, 65535, 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_RIGHT_ATTACH,
                                              g_param_spec_uint ("right-attach", 
                                                                 P_("Right attachment"), 
                                                                 P_("The column number to attach the right side of a child widget to"),
                                                                 1, 65535, 1,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_TOP_ATTACH,
                                              g_param_spec_uint ("top-attach", 
                                                                 P_("Top attachment"), 
                                                                 P_("The row number to attach the top of a child widget to"),
                                                                 0, 65535, 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_BOTTOM_ATTACH,
                                              g_param_spec_uint ("bottom-attach",
                                                                 P_("Bottom attachment"), 
                                                                 P_("The row number to attach the bottom of the child to"),
                                                                 1, 65535, 1,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_X_OPTIONS,
                                              g_param_spec_flags ("x-options", 
                                                                  P_("Horizontal options"), 
                                                                  P_("Options specifying the horizontal behaviour of the child"),
                                                                  GTK_TYPE_ATTACH_OPTIONS, GTK_EXPAND | GTK_FILL,
-                                                                 G_PARAM_READWRITE));
+                                                                 GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_Y_OPTIONS,
                                              g_param_spec_flags ("y-options", 
                                                                  P_("Vertical options"), 
                                                                  P_("Options specifying the vertical behaviour of the child"),
                                                                  GTK_TYPE_ATTACH_OPTIONS, GTK_EXPAND | GTK_FILL,
-                                                                 G_PARAM_READWRITE));
+                                                                 GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_X_PADDING,
                                              g_param_spec_uint ("x-padding", 
                                                                 P_("Horizontal padding"), 
                                                                 P_("Extra space to put between the child and its left and right neighbors, in pixels"),
                                                                 0, 65535, 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_Y_PADDING,
                                              g_param_spec_uint ("y-padding", 
                                                                 P_("Vertical padding"), 
                                                                 P_("Extra space to put between the child and its upper and lower neighbors, in pixels"),
                                                                 0, 65535, 0,
-                                                                G_PARAM_READWRITE));
+                                                                GTK_PARAM_READWRITE));
 }
 
 static GType
index 99ece3aeecc6e61ef5167a66f3b6aa2e4308bdb4..be7a6fe60935da88476b0531a8b9d5cab6ff9e53 100644 (file)
@@ -42,6 +42,7 @@
 #include "gtktext.h"
 #include "line-wrap.xbm"
 #include "line-arrow.xbm"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -605,7 +606,7 @@ gtk_text_class_init (GtkTextClass *class)
                                                         P_("Horizontal Adjustment"),
                                                         P_("Horizontal adjustment for the text widget"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_VADJUSTMENT,
@@ -613,7 +614,7 @@ gtk_text_class_init (GtkTextClass *class)
                                                         P_("Vertical Adjustment"),
                                                         P_("Vertical adjustment for the text widget"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_LINE_WRAP,
@@ -621,7 +622,7 @@ gtk_text_class_init (GtkTextClass *class)
                                                         P_("Line Wrap"),
                                                         P_("Whether lines are wrapped at widget edges"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WORD_WRAP,
@@ -629,7 +630,7 @@ gtk_text_class_init (GtkTextClass *class)
                                                         P_("Word Wrap"),
                                                         P_("Whether words are wrapped at widget edges"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   widget_class->set_scroll_adjustments_signal =
     gtk_signal_new ("set_scroll_adjustments",
index 17dafaad798a3431bbc5acd1172efb1646a87ad4..3cea28d37e8ca303b7ff69eb6ec60348af9088dd 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtktextbuffer.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -184,7 +185,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                                                         P_("Tag Table"),
                                                         P_("Text Tag Table"),
                                                         GTK_TYPE_TEXT_TAG_TABLE,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   signals[INSERT_TEXT] =
     g_signal_new ("insert_text",
index 890c74447dad65dddc857095fb5d737339a21575..675629019ba82197884ba0809cd089aaa32cf91c 100644 (file)
@@ -55,6 +55,7 @@
 #include "gtkmain.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #include <stdlib.h>
@@ -197,7 +198,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Tag name"),
                                                         P_("Name used to refer to the text tag. NULL for anonymous tags"),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   /* Style args */
 
@@ -207,7 +208,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Background color name"),
                                                         P_("Background color as a string"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_BACKGROUND_GDK,
@@ -215,7 +216,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        P_("Background color"),
                                                        P_("Background color as a (possibly unallocated) GdkColor"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_BACKGROUND_FULL_HEIGHT,
@@ -223,7 +224,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                          P_("Background full height"),
                                                          P_("Whether the background color fills the entire line height or only the height of the tagged characters"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -232,7 +233,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Background stipple mask"),
                                                         P_("Bitmap to use as a mask when drawing the text background"),
                                                         GDK_TYPE_PIXMAP,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                        GTK_PARAM_READWRITE));  
 
 
   g_object_class_install_property (object_class,
@@ -241,7 +242,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Foreground color name"),
                                                         P_("Foreground color as a string"),
                                                         NULL,
-                                                        G_PARAM_WRITABLE));
+                                                        GTK_PARAM_WRITABLE));
 
   g_object_class_install_property (object_class,
                                    PROP_FOREGROUND_GDK,
@@ -249,7 +250,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        P_("Foreground color"),
                                                        P_("Foreground color as a (possibly unallocated) GdkColor"),
                                                        GDK_TYPE_COLOR,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -258,7 +259,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Foreground stipple mask"),
                                                         P_("Bitmap to use as a mask when drawing the text foreground"),
                                                         GDK_TYPE_PIXMAP,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                        GTK_PARAM_READWRITE));  
   
   g_object_class_install_property (object_class,
                                    PROP_DIRECTION,
@@ -267,7 +268,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                       P_("Text direction, e.g. right-to-left or left-to-right"),
                                                       GTK_TYPE_TEXT_DIRECTION,
                                                       GTK_TEXT_DIR_LTR,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_EDITABLE,
@@ -275,7 +276,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                          P_("Editable"),
                                                          P_("Whether the text can be modified by the user"),
                                                          TRUE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_FONT,
@@ -283,7 +284,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Font"),
                                                         P_("Font description as a string, e.g. \"Sans Italic 12\""),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_FONT_DESC,
@@ -291,7 +292,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        P_("Font"),
                                                        P_("Font description as a PangoFontDescription struct"),
                                                        PANGO_TYPE_FONT_DESCRIPTION,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -300,7 +301,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Font family"),
                                                         P_("Name of the font family, e.g. Sans, Helvetica, Times, Monospace"),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_STYLE,
@@ -309,7 +310,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                       P_("Font style as a PangoStyle, e.g. PANGO_STYLE_ITALIC"),
                                                       PANGO_TYPE_STYLE,
                                                       PANGO_STYLE_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_VARIANT,
@@ -318,7 +319,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      P_("Font variant as a PangoVariant, e.g. PANGO_VARIANT_SMALL_CAPS"),
                                                       PANGO_TYPE_VARIANT,
                                                       PANGO_VARIANT_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_WEIGHT,
@@ -328,7 +329,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      PANGO_WEIGHT_NORMAL,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   
 
   g_object_class_install_property (object_class,
@@ -338,7 +339,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                       P_("Font stretch as a PangoStretch, e.g. PANGO_STRETCH_CONDENSED"),
                                                       PANGO_TYPE_STRETCH,
                                                       PANGO_STRETCH_NORMAL,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_SIZE,
@@ -348,7 +349,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SCALE,
@@ -358,7 +359,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         1.0,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_SIZE_POINTS,
@@ -368,7 +369,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         0.0,
                                                         G_MAXDOUBLE,
                                                         0.0,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                        GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (object_class,
                                    PROP_JUSTIFICATION,
@@ -377,7 +378,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                       P_("Left, right, or center justification"),
                                                       GTK_TYPE_JUSTIFICATION,
                                                       GTK_JUSTIFY_LEFT,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_LANGUAGE,
@@ -385,7 +386,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                         P_("Language"),
                                                         P_("The language this text is in, as an ISO code. Pango can use this as a hint when rendering the text. If not set, an appropriate default will be used."),
                                                         NULL,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));  
+                                                        GTK_PARAM_READWRITE));  
 
   g_object_class_install_property (object_class,
                                    PROP_LEFT_MARGIN,
@@ -395,7 +396,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_RIGHT_MARGIN,
@@ -405,7 +406,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -416,7 +417,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      G_MININT,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   
   g_object_class_install_property (object_class,
@@ -427,7 +428,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                     G_MININT,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_PIXELS_ABOVE_LINES,
@@ -437,7 +438,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_PIXELS_BELOW_LINES,
@@ -447,7 +448,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_PIXELS_INSIDE_WRAP,
@@ -457,7 +458,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      0,
                                                      G_MAXINT,
                                                      0,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_STRIKETHROUGH,
@@ -465,7 +466,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                          P_("Strikethrough"),
                                                          P_("Whether to strike through the text"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_UNDERLINE,
@@ -474,7 +475,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                       P_("Style of underline for this text"),
                                                       PANGO_TYPE_UNDERLINE,
                                                       PANGO_UNDERLINE_NONE,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_WRAP_MODE,
@@ -483,7 +484,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                      P_("Whether to wrap lines never, at word boundaries, or at character boundaries"),
                                                       GTK_TYPE_WRAP_MODE,
                                                       GTK_WRAP_NONE,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
 
   g_object_class_install_property (object_class,
@@ -492,7 +493,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                        P_("Tabs"),
                                                        P_("Custom tabs for this text"),
                                                        PANGO_TYPE_TAB_ARRAY,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_INVISIBLE,
@@ -500,11 +501,11 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                                                          P_("Invisible"),
                                                          P_("Whether this text is hidden. Not implemented in GTK 2.0"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   /* Style props are set or not */
 
-#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, G_PARAM_READABLE | G_PARAM_WRITABLE))
+#define ADD_SET_PROP(propname, propval, nick, blurb) g_object_class_install_property (object_class, propval, g_param_spec_boolean (propname, nick, blurb, FALSE, GTK_PARAM_READWRITE))
 
   ADD_SET_PROP ("background-set", PROP_BACKGROUND_SET,
                 P_("Background set"),
index 5f8bf2ed64c8b0537826eddfb7fcd6cb92bb1565..a739bb791084f323718c88ba363c0ca0a437891d 100644 (file)
@@ -549,7 +549,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_PIXELS_BELOW_LINES,
@@ -559,7 +559,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_PIXELS_INSIDE_WRAP,
@@ -569,7 +569,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_EDITABLE,
@@ -577,7 +577,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                         P_("Editable"),
                                                         P_("Whether the text can be modified by the user"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WRAP_MODE,
@@ -586,7 +586,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                      P_("Whether to wrap lines never, at word boundaries, or at character boundaries"),
                                                      GTK_TYPE_WRAP_MODE,
                                                      GTK_WRAP_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_JUSTIFICATION,
@@ -595,7 +595,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                      P_("Left, right, or center justification"),
                                                      GTK_TYPE_JUSTIFICATION,
                                                      GTK_JUSTIFY_LEFT,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_LEFT_MARGIN,
@@ -605,7 +605,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_RIGHT_MARGIN,
@@ -615,7 +615,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_INDENT,
@@ -625,7 +625,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_TABS,
@@ -633,7 +633,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                        P_("Tabs"),
                                                        P_("Custom tabs for this text"),
                                                        PANGO_TYPE_TAB_ARRAY,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_CURSOR_VISIBLE,
@@ -641,7 +641,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                         P_("Cursor Visible"),
                                                         P_("If the insertion cursor is shown"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_BUFFER,
@@ -649,7 +649,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                        P_("Buffer"),
                                                        P_("The buffer which is displayed"),
                                                        GTK_TYPE_TEXT_BUFFER,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_OVERWRITE,
@@ -657,7 +657,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                         P_("Overwrite mode"),
                                                         P_("Whether entered text overwrites existing contents"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ACCEPTS_TAB,
@@ -665,7 +665,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                         P_("Accepts tab"),
                                                         P_("Whether Tab will result in a tab character being entered"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /*
    * Style properties
@@ -675,7 +675,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                                                               P_("Error underline color"),
                                                               P_("Color with which to draw error-indication underlines"),
                                                               GDK_TYPE_COLOR,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   
   /*
    * Signals
index aee4ffada284230f4b9686e6abb43ba4d585ab38..b5ec6b0aa9cbaa723e6641eff1db895fe29d8fc4 100644 (file)
@@ -134,10 +134,10 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
   class->widget_entered = gtk_tips_query_widget_entered;
   class->widget_selected = NULL;
 
-  gtk_object_add_arg_type ("GtkTipsQuery::emit-always", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EMIT_ALWAYS);
-  gtk_object_add_arg_type ("GtkTipsQuery::caller", GTK_TYPE_WIDGET, GTK_ARG_READWRITE, ARG_CALLER);
-  gtk_object_add_arg_type ("GtkTipsQuery::label-inactive", GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_LABEL_INACTIVE);
-  gtk_object_add_arg_type ("GtkTipsQuery::label-no-tip", GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_LABEL_NO_TIP);
+  gtk_object_add_arg_type ("GtkTipsQuery::emit-always", GTK_TYPE_BOOL, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_EMIT_ALWAYS);
+  gtk_object_add_arg_type ("GtkTipsQuery::caller", GTK_TYPE_WIDGET, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_CALLER);
+  gtk_object_add_arg_type ("GtkTipsQuery::label-inactive", GTK_TYPE_STRING, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_LABEL_INACTIVE);
+  gtk_object_add_arg_type ("GtkTipsQuery::label-no-tip", GTK_TYPE_STRING, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_LABEL_NO_TIP);
 
   tips_query_signals[SIGNAL_START_QUERY] =
     gtk_signal_new ("start_query",
index ab2cd3871ba59c3f83cbe16c414ac547c2ca4fe2..d6abd0cb1c7791a34516523573876c413694b860 100644 (file)
@@ -36,6 +36,7 @@
 #include "gtktoggletoolbutton.h"
 #include "gtktogglebutton.h"
 #include "gtkcheckmenuitem.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 enum 
@@ -130,7 +131,7 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass)
                                                          P_("Create the same proxies as a radio action"),
                                                          P_("Whether the proxies for this action look like radio action proxies"),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
 
   action_signals[TOGGLED] =
     g_signal_new ("toggled",
index be6b3c72a298b41fb615014a044185de582179f3..5971d9359f961aa81ac6f92aa1326eac6ed12c25 100644 (file)
@@ -29,6 +29,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtktogglebutton.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -134,7 +135,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                                                         P_("Active"),
                                                         P_("If the toggle button should be pressed in or not"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_INCONSISTENT,
@@ -142,7 +143,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                                                         P_("Inconsistent"),
                                                         P_("If the toggle button is in an \"in between\" state"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_DRAW_INDICATOR,
@@ -150,7 +151,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                                                         P_("Draw Indicator"),
                                                         P_("If the toggle part of the button is displayed"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   toggle_button_signals[TOGGLED] =
     g_signal_new ("toggled",
index 63312de88e7ab0bbdaae35c90a893625f4d1c74e..0607d80ad5e4d3ae104ddb31b2b7f9be937aedfa 100644 (file)
@@ -27,6 +27,7 @@
 #include "gtkstock.h"
 #include "gtkintl.h"
 #include "gtkradiotoolbutton.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define MENU_ID "gtk-toggle-tool-button-menu-id"
index dd1de9de0601097fbff3768a7e13bc15d45d9b4e..41ed31c9fc7a39594e455e188fa87a2e9454adb1 100644 (file)
@@ -508,7 +508,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                      P_("The orientation of the toolbar"),
                                                      GTK_TYPE_ORIENTATION,
                                                      GTK_ORIENTATION_HORIZONTAL,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_TOOLBAR_STYLE,
@@ -517,14 +517,14 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                      P_("How to draw the toolbar"),
                                                      GTK_TYPE_TOOLBAR_STYLE,
                                                      GTK_TOOLBAR_ICONS,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SHOW_ARROW,
                                   g_param_spec_boolean ("show-arrow",
                                                         P_("Show Arrow"),
                                                         P_("If an arrow should be shown if the toolbar doesn't fit"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   /* child properties */
   gtk_container_class_install_child_property (container_class,
@@ -533,7 +533,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                                    P_("Expand"), 
                                                                    P_("Whether the item should receive extra space when the toolbar grows"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
   
   gtk_container_class_install_child_property (container_class,
                                              CHILD_PROP_HOMOGENEOUS,
@@ -541,7 +541,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                                    P_("Homogeneous"), 
                                                                    P_("Whether the item should be the same size as other homogeneous items"),
                                                                    TRUE,
-                                                                   G_PARAM_READWRITE));
+                                                                   GTK_PARAM_READWRITE));
   
   /* style properties */
   gtk_widget_class_install_style_property (widget_class,
@@ -551,7 +551,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                              DEFAULT_SPACE_SIZE,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("internal-padding",
@@ -560,7 +560,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                             0,
                                                             G_MAXINT,
                                                              DEFAULT_IPADDING,
-                                                             G_PARAM_READABLE));
+                                                             GTK_PARAM_READABLE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_enum ("space-style",
@@ -568,7 +568,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                              P_("Whether spacers are vertical lines or just blank"),
                                                               GTK_TYPE_TOOLBAR_SPACE_STYLE,
                                                               DEFAULT_SPACE_STYLE,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_enum ("button-relief",
@@ -576,28 +576,28 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
                                                              P_("Type of bevel around toolbar buttons"),
                                                               GTK_TYPE_RELIEF_STYLE,
                                                               GTK_RELIEF_NONE,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_enum ("shadow-type",
                                                               P_("Shadow type"),
                                                               P_("Style of bevel around the toolbar"),
                                                               GTK_TYPE_SHADOW_TYPE,
                                                               GTK_SHADOW_OUT,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   
   gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-style",
                                                     P_("Toolbar style"),
                                                     P_("Whether default toolbars have text only, text and icons, icons only, etc."),
                                                     GTK_TYPE_TOOLBAR_STYLE,
                                                     DEFAULT_TOOLBAR_STYLE,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   gtk_settings_install_property (g_param_spec_enum ("gtk-toolbar-icon-size",
                                                     P_("Toolbar icon size"),
                                                     P_("Size of icons in default toolbars"),
                                                     GTK_TYPE_ICON_SIZE,
                                                     DEFAULT_ICON_SIZE,
-                                                    G_PARAM_READWRITE));  
+                                                    GTK_PARAM_READWRITE));  
   
   binding_set = gtk_binding_set_by_class (klass);
   
index fd0e697542e87d4554b949987619239d305973cb..1c59bd1711d80fc9273f7c22c981b0ecda5bf213 100644 (file)
@@ -33,6 +33,7 @@
 #include "gtkintl.h"
 #include "gtktoolbar.h"
 #include "gtkiconfactory.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #include <string.h>
@@ -181,35 +182,35 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
                                                        P_("Label"),
                                                        P_("Text to show in the item."),
                                                        NULL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_USE_UNDERLINE,
                                   g_param_spec_boolean ("use-underline",
                                                         P_("Use underline"),
                                                         P_("If set, an underline in the label property indicates that the next character should be used for the mnemonic accelerator key in the overflow menu"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_LABEL_WIDGET,
                                   g_param_spec_object ("label-widget",
                                                        P_("Label widget"),
                                                        P_("Widget to use as the item label"),
                                                        GTK_TYPE_WIDGET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_STOCK_ID,
                                   g_param_spec_string ("stock-id",
                                                        P_("Stock Id"),
                                                        P_("The stock icon displayed on the item"),
                                                        NULL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_ICON_WIDGET,
                                   g_param_spec_object ("icon-widget",
                                                        P_("Icon widget"),
                                                        P_("Icon widget to display in the item"),
                                                        GTK_TYPE_WIDGET,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
 /**
  * GtkToolButton::clicked:
index 4869f8c8768fed8031a4833290b66b69ea96c8c6..1dede85af106f1f769f3fdc6ef857ded0eed0980 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkalias.h"
+#include "gtkprivate.h"
 
 #include <string.h>
 
@@ -159,21 +160,21 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
                                                         P_("Visible when horizontal"),
                                                         P_("Whether the toolbar item is visible when the toolbar is in a horizontal orientation."),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_VISIBLE_VERTICAL,
                                   g_param_spec_boolean ("visible-vertical",
                                                         P_("Visible when vertical"),
                                                         P_("Whether the toolbar item is visible when the toolbar is in a vertical orientation."),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                   PROP_IS_IMPORTANT,
                                   g_param_spec_boolean ("is-important",
                                                         P_("Is important"),
                                                         P_("Whether the toolbar item is considered important. When TRUE, toolbar buttons show text in GTK_TOOLBAR_BOTH_HORIZ mode"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
 /**
  * GtkToolItem::create-menu-proxy:
index 4a2a1645d6809731cf5ff7da293b53d668bb55e3..a9516a47252ea6184516decaf24295cf85ae3e6c 100644 (file)
@@ -23,6 +23,7 @@
 #include "gtkintl.h"
 #include "gtktreednd.h"
 #include "gtkalias.h"
+#include "gtkprivate.h"
 #include <string.h>
 
 /* ITER FORMAT:
@@ -327,7 +328,7 @@ gtk_tree_model_filter_class_init (GtkTreeModelFilterClass *filter_class)
                                                         ("The child model"),
                                                         ("The model for the filtermodel to filter"),
                                                         GTK_TYPE_TREE_MODEL,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   g_object_class_install_property (object_class,
                                    PROP_VIRTUAL_ROOT,
@@ -335,7 +336,7 @@ gtk_tree_model_filter_class_init (GtkTreeModelFilterClass *filter_class)
                                                        ("The virtual root"),
                                                        ("The virtual root (relative to the child model) for this filtermodel"),
                                                        GTK_TYPE_TREE_PATH,
-                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
   g_type_class_add_private (object_class, sizeof (GtkTreeModelFilterPrivate));
 }
index 8376369c5eb7ef7cfbd4efdaa5aed4284737f6d5..dfc9e3e7ed30c1bcc54ca93a5738ead93deaf40d 100644 (file)
@@ -45,6 +45,7 @@
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
 #include "gtkintl.h"
+#include "gtkprivate.h"
 #include "gtktreednd.h"
 #include "gtkalias.h"
 
@@ -330,7 +331,7 @@ gtk_tree_model_sort_class_init (GtkTreeModelSortClass *class)
                                                        P_("TreeModelSort Model"),
                                                        P_("The model for the TreeModelSort to sort"),
                                                        GTK_TYPE_TREE_MODEL,
-                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                       GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
index 28fde73a873a4fc5a987c99d598cecb8465d268b..4ddcafd2323c1146a136d16658aecdd367753b8a 100644 (file)
@@ -41,6 +41,7 @@
 #include "gtkentry.h"
 #include "gtkframe.h"
 #include "gtktreemodelsort.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #define GTK_TREE_VIEW_PRIORITY_VALIDATE (GDK_PRIORITY_REDRAW + 5)
@@ -558,7 +559,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                        P_("TreeView Model"),
                                                        P_("The model for the tree view"),
                                                        GTK_TYPE_TREE_MODEL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_HADJUSTMENT,
@@ -566,7 +567,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                        P_("Horizontal Adjustment"),
                                                         P_("Horizontal Adjustment for the widget"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_VADJUSTMENT,
@@ -574,7 +575,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                        P_("Vertical Adjustment"),
                                                         P_("Vertical Adjustment for the widget"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_HEADERS_VISIBLE,
@@ -582,7 +583,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                         P_("Headers Visible"),
                                                         P_("Show the column header buttons"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_HEADERS_CLICKABLE,
@@ -590,7 +591,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                         P_("Headers Clickable"),
                                                         P_("Column headers respond to click events"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_EXPANDER_COLUMN,
@@ -598,7 +599,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                        P_("Expander Column"),
                                                        P_("Set the column for the expander column"),
                                                        GTK_TYPE_TREE_VIEW_COLUMN,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_REORDERABLE,
@@ -606,7 +607,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                         P_("Reorderable"),
                                                         P_("View is reorderable"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (o_class,
                                    PROP_RULES_HINT,
@@ -614,7 +615,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                         P_("Rules Hint"),
                                                         P_("Set a hint to the theme engine to draw rows in alternating colors"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
     g_object_class_install_property (o_class,
                                     PROP_ENABLE_SEARCH,
@@ -622,7 +623,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                           P_("Enable Search"),
                                                           P_("View allows user to search through columns interactively"),
                                                           TRUE,
-                                                          G_PARAM_READWRITE));
+                                                          GTK_PARAM_READWRITE));
 
     g_object_class_install_property (o_class,
                                     PROP_SEARCH_COLUMN,
@@ -632,7 +633,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                       -1,
                                                       G_MAXINT,
                                                       -1,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
     /**
      * GtkTreeView:fixed-height-mode:
@@ -651,7 +652,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                            P_("Fixed Height Mode"),
                                                            P_("Speeds up GtkTreeView by assuming that all rows have the same height"),
                                                            FALSE,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
     
     /**
      * GtkTreeView:hover-selection:
@@ -672,7 +673,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                            P_("Hover Selection"),
                                                            P_("Whether the selection should follow the pointer"),
                                                            FALSE,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
 
     /**
      * GtkTreeView:hover-expand:
@@ -692,7 +693,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                            P_("Hover Expand"),
                                                            P_("Whether rows should be expanded/collapsed when the pointer moves over them"),
                                                            FALSE,
-                                                           G_PARAM_READWRITE));
+                                                           GTK_PARAM_READWRITE));
 
   /* Style properties */
 #define _TREE_VIEW_EXPANDER_SIZE 12
@@ -706,7 +707,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             _TREE_VIEW_EXPANDER_SIZE,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("vertical-separator",
@@ -715,7 +716,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             _TREE_VIEW_VERTICAL_SEPARATOR,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_int ("horizontal-separator",
@@ -724,35 +725,35 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                                                             0,
                                                             G_MAXINT,
                                                             _TREE_VIEW_HORIZONTAL_SEPARATOR,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boolean ("allow-rules",
                                                                 P_("Allow Rules"),
                                                                 P_("Allow drawing of alternating color rows"),
                                                                 TRUE,
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                           g_param_spec_boolean ("indent-expanders",
                                                                 P_("Indent Expanders"),
                                                                 P_("Make the expanders indented"),
                                                                 TRUE,
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_boxed ("even-row-color",
                                                                P_("Even Row Color"),
                                                                P_("Color to use for even rows"),
                                                               GDK_TYPE_COLOR,
-G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (widget_class,
                                            g_param_spec_boxed ("odd-row-color",
                                                                P_("Odd Row Color"),
                                                                P_("Color to use for odd rows"),
                                                               GDK_TYPE_COLOR,
-G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 
   /* Signals */
   widget_class->set_scroll_adjustments_signal =
index 63e80cc5854cc86d5deaf41c3864b3d3c0e22b28..17c46f8782078061f380a7693942b3ee55e4ec18 100644 (file)
@@ -29,6 +29,7 @@
 #include "gtkhbox.h"
 #include "gtkmarshalers.h"
 #include "gtkarrow.h"
+#include "gtkprivate.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -225,7 +226,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Visible"),
                                                         P_("Whether to display the column"),
                                                          TRUE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_RESIZABLE,
@@ -233,7 +234,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Resizable"),
                                                         P_("Column is user-resizable"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_WIDTH,
@@ -243,7 +244,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READABLE));
+                                                    GTK_PARAM_READABLE));
   g_object_class_install_property (object_class,
                                    PROP_SPACING,
                                    g_param_spec_int ("spacing",
@@ -252,7 +253,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                     0,
                                                     G_MAXINT,
                                                     0,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (object_class,
                                    PROP_SIZING,
                                    g_param_spec_enum ("sizing",
@@ -260,7 +261,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                       P_("Resize mode of the column"),
                                                       GTK_TYPE_TREE_VIEW_COLUMN_SIZING,
                                                       GTK_TREE_VIEW_COLUMN_GROW_ONLY,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_FIXED_WIDTH,
@@ -270,7 +271,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                      1,
                                                      G_MAXINT,
                                                      1, /* not useful */
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_MIN_WIDTH,
@@ -280,7 +281,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_MAX_WIDTH,
@@ -290,7 +291,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                      -1,
                                                      G_MAXINT,
                                                      -1,
-                                                     G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                     GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_TITLE,
@@ -298,7 +299,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Title"),
                                                         P_("Title to appear in column header"),
                                                         "",
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_EXPAND,
@@ -306,7 +307,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Expand"),
                                                         P_("Column gets share of extra width allocated to the widget"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (object_class,
                                    PROP_CLICKABLE,
@@ -314,7 +315,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Clickable"),
                                                         P_("Whether the header can be clicked"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
   
 
   g_object_class_install_property (object_class,
@@ -323,7 +324,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Widget"),
                                                         P_("Widget to put in column header button instead of column title"),
                                                         GTK_TYPE_WIDGET,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_ALIGNMENT,
@@ -333,7 +334,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                        0.0,
                                                        1.0,
                                                        0.0,
-                                                       G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_REORDERABLE,
@@ -341,7 +342,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Reorderable"),
                                                         P_("Whether the column can be reordered around the headers"),
                                                         FALSE,
-                                                        G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SORT_INDICATOR,
@@ -349,7 +350,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                         P_("Sort indicator"),
                                                         P_("Whether to show a sort indicator"),
                                                          FALSE,
-                                                         G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (object_class,
                                    PROP_SORT_ORDER,
@@ -358,7 +359,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
                                                       P_("Sort direction the sort indicator should indicate"),
                                                       GTK_TYPE_SORT_TYPE,
                                                       GTK_SORT_ASCENDING,
-                                                      G_PARAM_READABLE | G_PARAM_WRITABLE));
+                                                      GTK_PARAM_READWRITE));
   
 }
 
index 8fa029353a7b35bf1e405c2e5736a99a81adc32c..dab5ffe45ef877bbe5263b2c2d36c280c394d71a 100644 (file)
@@ -41,6 +41,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktoolbar.h"
 #include "gtkuimanager.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 #undef DEBUG_UI_MANAGER
@@ -229,7 +230,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                                                         P_("Add tearoffs to menus"),
                                                         P_("Whether tearoff menu items should be added to menus"),
                                                          FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_UI,
@@ -237,7 +238,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
                                                        P_("Merged UI definition"),
                                                        P_("An XML string describing the merged UI"),
                                                        NULL,
-                                                       G_PARAM_READABLE));
+                                                       GTK_PARAM_READABLE));
 
 
   /**
index 22b2ab35ff032199518339c3a384bf0c930e2e6d..dbc958b7f2873dcefb9e39d632f64c168e7415b3 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkviewport.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
+#include "gtkprivate.h"
 #include "gtkalias.h"
 
 enum {
@@ -136,7 +137,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                                                        P_("Horizontal adjustment"),
                                                        P_("The GtkAdjustment that determines the values of the horizontal position for this viewport"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                    PROP_VADJUSTMENT,
@@ -144,7 +145,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                                                        P_("Vertical adjustment"),
                                                        P_("The GtkAdjustment that determines the values of the vertical position for this viewport"),
                                                         GTK_TYPE_ADJUSTMENT,
-                                                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SHADOW_TYPE,
@@ -153,7 +154,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                                                      P_("Determines how the shadowed box around the viewport is drawn"),
                                                      GTK_TYPE_SHADOW_TYPE,
                                                      GTK_SHADOW_IN,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   widget_class->set_scroll_adjustments_signal =
     g_signal_new ("set_scroll_adjustments",
index e7b528cbbd97cefe207d4e31760d6b938e6f3185..32a8b159b670ed969c752b350214a597e9318c67 100644 (file)
@@ -410,14 +410,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                        P_("Widget name"),
                                                        P_("The name of the widget"),
                                                        NULL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_PARENT,
                                   g_param_spec_object ("parent",
                                                        P_("Parent widget"), 
                                                        P_("The parent widget of this widget. Must be a Container widget"),
                                                        GTK_TYPE_CONTAINER,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_WIDTH_REQUEST,
@@ -427,7 +427,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HEIGHT_REQUEST,
                                   g_param_spec_int ("height-request",
@@ -436,84 +436,84 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_VISIBLE,
                                   g_param_spec_boolean ("visible",
                                                         P_("Visible"),
                                                         P_("Whether the widget is visible"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_SENSITIVE,
                                   g_param_spec_boolean ("sensitive",
                                                         P_("Sensitive"),
                                                         P_("Whether the widget responds to input"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_APP_PAINTABLE,
                                   g_param_spec_boolean ("app-paintable",
                                                         P_("Application paintable"),
                                                         P_("Whether the application will paint directly on the widget"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_CAN_FOCUS,
                                   g_param_spec_boolean ("can-focus",
                                                         P_("Can focus"),
                                                         P_("Whether the widget can accept the input focus"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HAS_FOCUS,
                                   g_param_spec_boolean ("has-focus",
                                                         P_("Has focus"),
                                                         P_("Whether the widget has the input focus"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_IS_FOCUS,
                                   g_param_spec_boolean ("is-focus",
                                                         P_("Is focus"),
                                                         P_("Whether the widget is the focus widget within the toplevel"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_CAN_DEFAULT,
                                   g_param_spec_boolean ("can-default",
                                                         P_("Can default"),
                                                         P_("Whether the widget can be the default widget"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_HAS_DEFAULT,
                                   g_param_spec_boolean ("has-default",
                                                         P_("Has default"),
                                                         P_("Whether the widget is the default widget"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_RECEIVES_DEFAULT,
                                   g_param_spec_boolean ("receives-default",
                                                         P_("Receives default"),
                                                         P_("If TRUE, the widget will receive the default action when it is focused"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_COMPOSITE_CHILD,
                                   g_param_spec_boolean ("composite-child",
                                                         P_("Composite child"),
                                                         P_("Whether the widget is part of a composite widget"),
                                                         FALSE,
-                                                        G_PARAM_READABLE));
+                                                        GTK_PARAM_READABLE));
   g_object_class_install_property (gobject_class,
                                   PROP_STYLE,
                                   g_param_spec_object ("style",
                                                        P_("Style"),
                                                        P_("The style of the widget, which contains information about how it will look (colors etc)"),
                                                        GTK_TYPE_STYLE,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_EVENTS,
                                   g_param_spec_flags ("events",
@@ -521,7 +521,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                       P_("The event mask that decides what kind of GdkEvents this widget gets"),
                                                       GDK_TYPE_EVENT_MASK,
                                                       GDK_STRUCTURE_MASK,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_EXTENSION_EVENTS,
                                   g_param_spec_enum ("extension-events",
@@ -529,14 +529,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                      P_("The mask that decides what kind of extension events this widget gets"),
                                                      GDK_TYPE_EXTENSION_MODE,
                                                      GDK_EXTENSION_EVENTS_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
                                   PROP_NO_SHOW_ALL,
                                   g_param_spec_boolean ("no-show-all",
                                                         P_("No show all"),
                                                         P_("Whether gtk_widget_show_all() should not affect this widget"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   widget_signals[SHOW] =
     g_signal_new ("show",
                  G_TYPE_FROM_CLASS (gobject_class),
@@ -1417,45 +1417,45 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                                 P_("Interior Focus"),
                                                                 P_("Whether to draw the focus indicator inside widgets"),
                                                                 TRUE,
-                                                                G_PARAM_READABLE));
+                                                                GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_int ("focus-line-width",
                                                             P_("Focus linewidth"),
                                                             P_("Width, in pixels, of the focus indicator line"),
                                                             0, G_MAXINT, 1,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
 
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_string ("focus-line-pattern",
                                                                P_("Focus line dash pattern"),
                                                                P_("Dash pattern used to draw the focus indicator"),
                                                                "\1\1",
-                                                               G_PARAM_READABLE));
+                                                               GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_int ("focus-padding",
                                                             P_("Focus padding"),
                                                             P_("Width, in pixels, between focus indicator and the widget 'box'"),
                                                             0, G_MAXINT, 1,
-                                                            G_PARAM_READABLE));
+                                                            GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_boxed ("cursor-color",
                                                               P_("Cursor color"),
                                                               P_("Color with which to draw insertion cursor"),
                                                               GDK_TYPE_COLOR,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_boxed ("secondary-cursor-color",
                                                               P_("Secondary cursor color"),
                                                               P_("Color with which to draw the secondary insertion cursor when editing mixed right-to-left and left-to-right text"),
                                                               GDK_TYPE_COLOR,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
   gtk_widget_class_install_style_property (klass,
                                           g_param_spec_float ("cursor-aspect-ratio",
                                                               P_("Cursor line aspect ratio"),
                                                               P_("Aspect ratio with which to draw insertion cursor"),
                                                               0.0, 1.0, 0.04,
-                                                              G_PARAM_READABLE));
+                                                              GTK_PARAM_READABLE));
 }
 
 static void
index 1434ccc06c249186d02361927a95051dcb5c9362..811200f09a0bef9bde10127164f9b52c016ac497 100644 (file)
@@ -419,7 +419,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                      P_("The type of the window"),
                                                      GTK_TYPE_WINDOW_TYPE,
                                                      GTK_WINDOW_TOPLEVEL,
-                                                     G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+                                                     GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
   /* Regular Props */
   g_object_class_install_property (gobject_class,
                                    PROP_TITLE,
@@ -427,7 +427,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Window Title"),
                                                         P_("The title of the window"),
                                                         NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ROLE,
@@ -435,7 +435,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                        P_("Window Role"),
                                                        P_("Unique identifier for the window to be used when restoring a session"),
                                                        NULL,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_SHRINK,
@@ -444,7 +444,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         /* xgettext:no-c-format */
                                                         P_("If TRUE, the window has no mimimum size. Setting this to TRUE is 99% of the time a bad idea"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ALLOW_GROW,
@@ -452,7 +452,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Allow Grow"),
                                                         P_("If TRUE, users can expand the window beyond its minimum size"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_RESIZABLE,
@@ -460,7 +460,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Resizable"),
                                                         P_("If TRUE, users can resize the window"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_MODAL,
@@ -468,7 +468,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Modal"),
                                                         P_("If TRUE, the window is modal (other windows are not usable while this one is up)"),
                                                         FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_WIN_POS,
@@ -477,7 +477,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                      P_("The initial position of the window"),
                                                      GTK_TYPE_WINDOW_POSITION,
                                                      GTK_WIN_POS_NONE,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
  
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_WIDTH,
@@ -487,7 +487,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DEFAULT_HEIGHT,
@@ -497,7 +497,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                     -1,
                                                     G_MAXINT,
                                                     -1,
-                                                    G_PARAM_READWRITE));
+                                                    GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_DESTROY_WITH_PARENT,
@@ -505,7 +505,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Destroy with Parent"),
                                                         P_("If this window should be destroyed when the parent is destroyed"),
                                                          FALSE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_ICON,
@@ -513,7 +513,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Icon"),
                                                         P_("Icon for this window"),
                                                         GDK_TYPE_PIXBUF,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   /**
    * GtkWindow:icon-name:
@@ -529,7 +529,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Icon Name"),
                                                         P_("Name of the themed icon for this window"),
                                                        NULL,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
   
   g_object_class_install_property (gobject_class,
                                   PROP_SCREEN,
@@ -537,7 +537,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                        P_("Screen"),
                                                        P_("The screen where this window will be displayed"),
                                                        GDK_TYPE_SCREEN,
-                                                       G_PARAM_READWRITE));
+                                                       GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_IS_ACTIVE,
@@ -545,7 +545,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Is Active"),
                                                         P_("Whether the toplevel is the current active window"),
                                                         FALSE,
-                                                        G_PARAM_READABLE));
+                                                        GTK_PARAM_READABLE));
   
   g_object_class_install_property (gobject_class,
                                    PROP_HAS_TOPLEVEL_FOCUS,
@@ -553,7 +553,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Focus in Toplevel"),
                                                         P_("Whether the input focus is within this GtkWindow"),
                                                         FALSE,
-                                                        G_PARAM_READABLE));
+                                                        GTK_PARAM_READABLE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_TYPE_HINT,
@@ -562,7 +562,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                       P_("Hint to help the desktop environment understand what kind of window this is and how to treat it."),
                                                       GDK_TYPE_WINDOW_TYPE_HINT,
                                                       GDK_WINDOW_TYPE_HINT_NORMAL,
-                                                      G_PARAM_READWRITE));
+                                                      GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_SKIP_TASKBAR_HINT,
@@ -570,7 +570,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                          P_("Skip taskbar"),
                                                          P_("TRUE if the window should not be in the task bar."),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));
+                                                         GTK_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                   PROP_SKIP_PAGER_HINT,
@@ -578,7 +578,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                          P_("Skip pager"),
                                                          P_("TRUE if the window should not be in the pager."),
                                                          FALSE,
-                                                         G_PARAM_READWRITE));  
+                                                         GTK_PARAM_READWRITE));  
 
   /**
    * GtkWindow:accept-focus-hint:
@@ -593,7 +593,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                          P_("Accept focus"),
                                                          P_("TRUE if the window should receive the input focus."),
                                                          TRUE,
-                                                         G_PARAM_READWRITE));  
+                                                         GTK_PARAM_READWRITE));  
 
   /**
    * GtkWindow:focus-on-map-hint:
@@ -608,7 +608,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                          P_("Focus on map"),
                                                          P_("TRUE if the window should receive the input focus when mapped."),
                                                          TRUE,
-                                                         G_PARAM_READWRITE));  
+                                                         GTK_PARAM_READWRITE));  
 
   /**
    * GtkWindow:decorated:
@@ -623,7 +623,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                         P_("Decorated"),
                                                         P_("Whether the window should be decorated by the window manager"),
                                                         TRUE,
-                                                        G_PARAM_READWRITE));
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkWindow:gravity:
@@ -640,7 +640,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                      P_("The window gravity of the window"),
                                                      GDK_TYPE_GRAVITY,
                                                      GDK_GRAVITY_NORTH_WEST,
-                                                     G_PARAM_READWRITE));
+                                                     GTK_PARAM_READWRITE));
 
   window_signals[SET_FOCUS] =
     g_signal_new ("set_focus",