From 7a2748dfec79a0ce7ee26e0fb382a713ab8bae21 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 22 Aug 2011 13:26:52 -0500 Subject: Adding an enum for the the disposition and functions to set and get it --- libdbusmenu-gtk/genericmenuitem.h | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'libdbusmenu-gtk/genericmenuitem.h') diff --git a/libdbusmenu-gtk/genericmenuitem.h b/libdbusmenu-gtk/genericmenuitem.h index 5e3c640..17759e3 100644 --- a/libdbusmenu-gtk/genericmenuitem.h +++ b/libdbusmenu-gtk/genericmenuitem.h @@ -42,11 +42,12 @@ G_BEGIN_DECLS #define IS_GENERICMENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GENERICMENUITEM_TYPE)) #define GENERICMENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GENERICMENUITEM_TYPE, GenericmenuitemClass)) -typedef struct _Genericmenuitem Genericmenuitem; -typedef struct _GenericmenuitemClass GenericmenuitemClass; -typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate; -typedef enum _GenericmenuitemCheckType GenericmenuitemCheckType; -typedef enum _GenericmenuitemState GenericmenuitemState; +typedef struct _Genericmenuitem Genericmenuitem; +typedef struct _GenericmenuitemClass GenericmenuitemClass; +typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate; +typedef enum _GenericmenuitemCheckType GenericmenuitemCheckType; +typedef enum _GenericmenuitemState GenericmenuitemState; +typedef enum _GenericmenuitemDisposition GenericmenuitemDisposition; /* GenericmenuitemClass: @@ -77,14 +78,24 @@ enum _GenericmenuitemState { GENERICMENUITEM_STATE_INDETERMINATE }; -GType genericmenuitem_get_type (void); -void genericmenuitem_set_check_type (Genericmenuitem * item, - GenericmenuitemCheckType check_type); -void genericmenuitem_set_state (Genericmenuitem * item, - GenericmenuitemState state); -void genericmenuitem_set_image (Genericmenuitem * item, - GtkWidget * image); -GtkWidget * genericmenuitem_get_image (Genericmenuitem * item); +enum _GenericmenuitemDisposition { + GENERICMENUITEM_DISPOSITION_NORMAL, + GENERICMENUITEM_DISPOSITION_INFORMATIONAL, + GENERICMENUITEM_DISPOSITION_WARNING, + GENERICMENUITEM_DISPOSITION_ALERT +}; + +GType genericmenuitem_get_type (void); +void genericmenuitem_set_check_type (Genericmenuitem * item, + GenericmenuitemCheckType check_type); +void genericmenuitem_set_state (Genericmenuitem * item, + GenericmenuitemState state); +void genericmenuitem_set_image (Genericmenuitem * item, + GtkWidget * image); +GtkWidget * genericmenuitem_get_image (Genericmenuitem * item); +void genericmenuitem_set_disposition (Genericmenuitem * item, + GenericmenuitemDisposition disposition); +GenericmenuitemDisposition genericmenuitem_get_disposition (Genericmenuitem * item); G_END_DECLS -- cgit v1.2.3 From 43b297e2056a9915e4c26f998c1b4631debb7455 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 22 Aug 2011 14:31:31 -0500 Subject: Adding in a disposition type and get proper enum generation --- libdbusmenu-gtk/genericmenuitem.h | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'libdbusmenu-gtk/genericmenuitem.h') diff --git a/libdbusmenu-gtk/genericmenuitem.h b/libdbusmenu-gtk/genericmenuitem.h index 17759e3..74db2ae 100644 --- a/libdbusmenu-gtk/genericmenuitem.h +++ b/libdbusmenu-gtk/genericmenuitem.h @@ -45,9 +45,6 @@ G_BEGIN_DECLS typedef struct _Genericmenuitem Genericmenuitem; typedef struct _GenericmenuitemClass GenericmenuitemClass; typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate; -typedef enum _GenericmenuitemCheckType GenericmenuitemCheckType; -typedef enum _GenericmenuitemState GenericmenuitemState; -typedef enum _GenericmenuitemDisposition GenericmenuitemDisposition; /* GenericmenuitemClass: @@ -66,24 +63,43 @@ struct _Genericmenuitem { GenericmenuitemPrivate * priv; }; -enum _GenericmenuitemCheckType { +/** + * GenericmenuitemCheckType: + * @GENERICMENUITEM_CHECK_TYPE_NONE: No check + * @GENERICMENUITEM_CHECK_TYPE_CHECKBOX: Nice little check + * @GENERICMENUITEM_CHECK_TYPE_RADIO: Radio button + */ +typedef enum { /*< prefix=GENERICMENUITEM_CHECK_TYPE >*/ GENERICMENUITEM_CHECK_TYPE_NONE, GENERICMENUITEM_CHECK_TYPE_CHECKBOX, GENERICMENUITEM_CHECK_TYPE_RADIO -}; - -enum _GenericmenuitemState { +} GenericmenuitemCheckType; + +/** + * GenericmenuitemState: + * @GENERICMENUITEM_STATE_UNCHECKED: No check visisble + * @GENERICMENUITEM_STATE_CHECKED: Check visible + * @GENERICMENUITEM_STATE_INDETERMINATE: We have no clue + */ +typedef enum { /*< prefix=GENERICMENUITEM_STATE >*/ GENERICMENUITEM_STATE_UNCHECKED, GENERICMENUITEM_STATE_CHECKED, GENERICMENUITEM_STATE_INDETERMINATE -}; - -enum _GenericmenuitemDisposition { +} GenericmenuitemState; + +/** + * GenericmenuitemDisposition: + * @GENERICMENUITEM_DISPOSITION_NORMAL: Normal state + * @GENERICMENUITEM_DISPOSITION_INFORMATIONAL: Item is informational + * @GENERICMENUITEM_DISPOSITION_WARNING: Oh, you should watch out for this one + * @GENERICMENUITEM_DISPOSITION_ALERT: Boom! + */ +typedef enum { /*< prefix=GENERICMENUITEM_DISPOSITION >*/ GENERICMENUITEM_DISPOSITION_NORMAL, GENERICMENUITEM_DISPOSITION_INFORMATIONAL, GENERICMENUITEM_DISPOSITION_WARNING, GENERICMENUITEM_DISPOSITION_ALERT -}; +} GenericmenuitemDisposition; GType genericmenuitem_get_type (void); void genericmenuitem_set_check_type (Genericmenuitem * item, -- cgit v1.2.3 From ed8019171e235d1bf852aa3e31c3cfeda6c0a7ed Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Aug 2011 15:41:33 -0500 Subject: Adding discriptive text to the enums --- libdbusmenu-gtk/genericmenuitem.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libdbusmenu-gtk/genericmenuitem.h') diff --git a/libdbusmenu-gtk/genericmenuitem.h b/libdbusmenu-gtk/genericmenuitem.h index 74db2ae..0b7df55 100644 --- a/libdbusmenu-gtk/genericmenuitem.h +++ b/libdbusmenu-gtk/genericmenuitem.h @@ -68,6 +68,8 @@ struct _Genericmenuitem { * @GENERICMENUITEM_CHECK_TYPE_NONE: No check * @GENERICMENUITEM_CHECK_TYPE_CHECKBOX: Nice little check * @GENERICMENUITEM_CHECK_TYPE_RADIO: Radio button + * + * Tracks what type of checkmark should be shown on the item */ typedef enum { /*< prefix=GENERICMENUITEM_CHECK_TYPE >*/ GENERICMENUITEM_CHECK_TYPE_NONE, @@ -80,6 +82,8 @@ typedef enum { /*< prefix=GENERICMENUITEM_CHECK_TYPE >*/ * @GENERICMENUITEM_STATE_UNCHECKED: No check visisble * @GENERICMENUITEM_STATE_CHECKED: Check visible * @GENERICMENUITEM_STATE_INDETERMINATE: We have no clue + * + * What the state of the check mark on the item is */ typedef enum { /*< prefix=GENERICMENUITEM_STATE >*/ GENERICMENUITEM_STATE_UNCHECKED, @@ -93,6 +97,8 @@ typedef enum { /*< prefix=GENERICMENUITEM_STATE >*/ * @GENERICMENUITEM_DISPOSITION_INFORMATIONAL: Item is informational * @GENERICMENUITEM_DISPOSITION_WARNING: Oh, you should watch out for this one * @GENERICMENUITEM_DISPOSITION_ALERT: Boom! + * + * What the disposition of the menu item is */ typedef enum { /*< prefix=GENERICMENUITEM_DISPOSITION >*/ GENERICMENUITEM_DISPOSITION_NORMAL, -- cgit v1.2.3