Add FontType enum, and a font_type parameter to gconf_peditor_new_font.

2002-04-10  Rachel Hestilow  <hestilow@ximian.com>

	* gconf-proprerty-editor.h: Add FontType enum, and a font_type
	parameter to gconf_peditor_new_font.

	* gconf-property-editor.c:
	(peditor_font_value_changed): Call peditor_font_merge_setting
	instead of setting the properties explicitly.
	(peditor_font_widget_changed): Switch on font_type to determine
	what to set for a GConfValue.
This commit is contained in:
Rachel Hestilow 2002-04-11 01:41:17 +00:00 committed by Rachel Hestilow
parent 68b79b4fab
commit ef4591f5fb
3 changed files with 108 additions and 16 deletions

View file

@ -41,6 +41,13 @@ typedef struct _GConfPropertyEditorPrivate GConfPropertyEditorPrivate;
typedef GConfValue *(*GConfPEditorValueConvFn) (GConfPropertyEditor *peditor, const GConfValue *);
typedef int (*GConfPEditorGetValueFn) (GConfPropertyEditor *peditor, gpointer data);
typedef enum
{
PEDITOR_FONT_NAME,
PEDITOR_FONT_SIZE,
PEDITOR_FONT_COMBINED
} GConfPEditorFontType;
struct _GConfPropertyEditor
{
GObject parent;
@ -123,9 +130,11 @@ GObject *gconf_peditor_new_numeric_range (GConfChangeSet *changeset,
GtkWidget *range,
gchar *first_property_name,
...);
GObject *gconf_peditor_new_font (GConfChangeSet *changeset,
gchar *key,
GtkWidget *font_picker,
GConfPEditorFontType font_type,
gchar *first_property_name,
...);