gparam.h		gparam.h
	skipping to change at line 133		skipping to change at line 133
	* Since 2.8		* Since 2.8
	* @G_PARAM_STATIC_NICK: the string used as nick when constructing the		* @G_PARAM_STATIC_NICK: the string used as nick when constructing the
	* parameter is guaranteed to remain valid and		* parameter is guaranteed to remain valid and
	* unmmodified for the lifetime of the parameter.		* unmmodified for the lifetime of the parameter.
	* Since 2.8		* Since 2.8
	* @G_PARAM_STATIC_BLURB: the string used as blurb when constructing the		* @G_PARAM_STATIC_BLURB: the string used as blurb when constructing the
	* parameter is guaranteed to remain valid and		* parameter is guaranteed to remain valid and
	* unmodified for the lifetime of the parameter.		* unmodified for the lifetime of the parameter.
	* Since 2.8		* Since 2.8
	* @G_PARAM_PRIVATE: internal		* @G_PARAM_PRIVATE: internal
			* @G_PARAM_DEPRECATED: the parameter is deprecated and will be removed
			* in a future version. A warning will be generated if it is used
			* while running with G_ENABLE_DIAGNOSTIC=1.
			* Since: 2.26
	*		*
	* Through the #GParamFlags flag values, certain aspects of parameters		* Through the #GParamFlags flag values, certain aspects of parameters
	* can be configured.		* can be configured.
	*/		*/
	typedef enum		typedef enum
	{		{
	G_PARAM_READABLE = 1 << 0,		G_PARAM_READABLE = 1 << 0,
	G_PARAM_WRITABLE = 1 << 1,		G_PARAM_WRITABLE = 1 << 1,
	G_PARAM_CONSTRUCT = 1 << 2,		G_PARAM_CONSTRUCT = 1 << 2,
	G_PARAM_CONSTRUCT_ONLY = 1 << 3,		G_PARAM_CONSTRUCT_ONLY = 1 << 3,
	G_PARAM_LAX_VALIDATION = 1 << 4,		G_PARAM_LAX_VALIDATION = 1 << 4,
	G_PARAM_STATIC_NAME = 1 << 5,		G_PARAM_STATIC_NAME = 1 << 5,
	#ifndef G_DISABLE_DEPRECATED		#ifndef G_DISABLE_DEPRECATED
	G_PARAM_PRIVATE = G_PARAM_STATIC_NAME,		G_PARAM_PRIVATE = G_PARAM_STATIC_NAME,
	#endif		#endif
	G_PARAM_STATIC_NICK = 1 << 6,		G_PARAM_STATIC_NICK = 1 << 6,
	G_PARAM_STATIC_BLURB = 1 << 7		G_PARAM_STATIC_BLURB = 1 << 7,
			/* User defined flags go up to 30 */
			G_PARAM_DEPRECATED = 1 << 31
	} GParamFlags;		} GParamFlags;
	/**		/**
	* G_PARAM_READWRITE:		* G_PARAM_READWRITE:
	*		*
	* #GParamFlags value alias for %G_PARAM_READABLE | %G_PARAM_WRITABLE.		* #GParamFlags value alias for %G_PARAM_READABLE | %G_PARAM_WRITABLE.
	*/		*/
	#define G_PARAM_READWRITE (G_PARAM_READABLE | G_PARAM_WRITABLE )		#define G_PARAM_READWRITE (G_PARAM_READABLE | G_PARAM_WRITABLE )
	/**		/**
	* G_PARAM_STATIC_STRINGS:		* G_PARAM_STATIC_STRINGS:
	*		*
	skipping to change at line 176		skipping to change at line 182
	/**		/**
	* G_PARAM_MASK:		* G_PARAM_MASK:
	*		*
	* Mask containing the bits of #GParamSpec.flags which are reserved for GLi b.		* Mask containing the bits of #GParamSpec.flags which are reserved for GLi b.
	*/		*/
	#define G_PARAM_MASK (0x000000ff)		#define G_PARAM_MASK (0x000000ff)
	/**		/**
	* G_PARAM_USER_SHIFT:		* G_PARAM_USER_SHIFT:
	*		*
	* Minimum shift count to be used for user defined flags, to be stored in		* Minimum shift count to be used for user defined flags, to be stored in
	* #GParamSpec.flags.		* #GParamSpec.flags. The maximum allowed is 30 + G_PARAM_USER_SHIFT.
	*/		*/
	#define G_PARAM_USER_SHIFT (8)		#define G_PARAM_USER_SHIFT (8)
	/* --- typedefs & structures --- */		/* --- typedefs & structures --- */
	typedef struct _GParamSpec GParamSpec;		typedef struct _GParamSpec GParamSpec;
	typedef struct _GParamSpecClass GParamSpecClass;		typedef struct _GParamSpecClass GParamSpecClass;
	typedef struct _GParameter GParameter;		typedef struct _GParameter GParameter;
	typedef struct _GParamSpecPool GParamSpecPool;		typedef struct _GParamSpecPool GParamSpecPool;
	/**		/**
	* GParamSpec:		* GParamSpec:
	* @g_type_instance: private #GTypeInstance portion		* @g_type_instance: private #GTypeInstance portion
	* @name: name of this parameter		* @name: name of this parameter
	* @flags: #GParamFlags flags for this parameter		* @flags: #GParamFlags flags for this parameter
	* @value_type: the #GValue type for this parameter		* @value_type: the #GValue type for this parameter
	* @owner_type: #GType type that uses (introduces) this paremeter		* @owner_type: #GType type that uses (introduces) this parameter
	*		*
	* All other fields of the <structname>GParamSpec</structname> struct are p rivate and		* All other fields of the <structname>GParamSpec</structname> struct are p rivate and
	* should not be used directly.		* should not be used directly.
	*/		*/
	struct _GParamSpec		struct _GParamSpec
	{		{
	GTypeInstance g_type_instance;		GTypeInstance g_type_instance;
	gchar *name;		gchar *name;
	GParamFlags flags;		GParamFlags flags;
End of changes. 4 change blocks.
	3 lines changed or deleted		9 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/