Merged in default (pull request #13)
Add accessor functions for flag and drop useless flag macros
Approved-by: Gary Kramlich
--- a/gntcheckbox.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntcheckbox.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_CHECK_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_CHECK_BOX))
#define GNT_CHECK_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_CHECK_BOX, GntCheckBoxClass))
-#define GNT_CHECK_BOX_FLAGS(obj) (GNT_CHECK_BOX(obj)->priv.flags)
-#define GNT_CHECK_BOX_SET_FLAGS(obj, flags) (GNT_CHECK_BOX_FLAGS(obj) |= flags)
-#define GNT_CHECK_BOX_UNSET_FLAGS(obj, flags) (GNT_CHECK_BOX_FLAGS(obj) &= ~(flags))
typedef struct _GntCheckBox GntCheckBox;
typedef struct _GntCheckBoxPriv GntCheckBoxPriv;
typedef struct _GntCheckBoxClass GntCheckBoxClass;
--- a/gntcombobox.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntcombobox.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_COMBO_BOX))
#define GNT_COMBO_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_COMBO_BOX, GntComboBoxClass))
-#define GNT_COMBO_BOX_FLAGS(obj) (GNT_COMBO_BOX(obj)->priv.flags)
-#define GNT_COMBO_BOX_SET_FLAGS(obj, flags) (GNT_COMBO_BOX_FLAGS(obj) |= flags)
-#define GNT_COMBO_BOX_UNSET_FLAGS(obj, flags) (GNT_COMBO_BOX_FLAGS(obj) &= ~(flags))
typedef struct _GntComboBox GntComboBox;
typedef struct _GntComboBoxPriv GntComboBoxPriv;
typedef struct _GntComboBoxClass GntComboBoxClass;
--- a/gntentry.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntentry.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_ENTRY))
#define GNT_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_ENTRY, GntEntryClass))
-#define GNT_ENTRY_FLAGS(obj) (GNT_ENTRY(obj)->priv.flags)
-#define GNT_ENTRY_SET_FLAGS(obj, flags) (GNT_ENTRY_FLAGS(obj) |= flags)
-#define GNT_ENTRY_UNSET_FLAGS(obj, flags) (GNT_ENTRY_FLAGS(obj) &= ~(flags))
#define GNT_ENTRY_CHAR '_' /* The character to use to fill in the blank places */
typedef struct _GntEntry GntEntry;
--- a/gntfilesel.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntfilesel.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_FILE_SEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_FILE_SEL))
#define GNT_FILE_SEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_FILE_SEL, GntFileSelClass))
-#define GNT_FILE_SEL_FLAGS(obj) (GNT_FILE_SEL(obj)->priv.flags)
-#define GNT_FILE_SEL_SET_FLAGS(obj, flags) (GNT_FILE_SEL_FLAGS(obj) |= flags)
-#define GNT_FILE_SEL_UNSET_FLAGS(obj, flags) (GNT_FILE_SEL_FLAGS(obj) &= ~(flags))
#define GNT_TYPE_FILE (gnt_file_get_type())
typedef struct _GntFileSel GntFileSel;
--- a/gntline.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntline.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_LINE))
#define GNT_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_LINE, GntLineClass))
-#define GNT_LINE_FLAGS(obj) (GNT_LINE(obj)->priv.flags)
-#define GNT_LINE_SET_FLAGS(obj, flags) (GNT_LINE_FLAGS(obj) |= flags)
-#define GNT_LINE_UNSET_FLAGS(obj, flags) (GNT_LINE_FLAGS(obj) &= ~(flags))
typedef struct _GntLine GntLine;
typedef struct _GntLinePriv GntLinePriv;
typedef struct _GntLineClass GntLineClass;
--- a/gntmenu.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntmenu.h Fri Apr 05 01:34:59 2019 +0000
@@ -40,10 +40,6 @@
#define GNT_IS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENU))
#define GNT_MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENU, GntMenuClass))
-#define GNT_MENU_FLAGS(obj) (GNT_MENU(obj)->priv.flags)
-#define GNT_MENU_SET_FLAGS(obj, flags) (GNT_MENU_FLAGS(obj) |= flags)
-#define GNT_MENU_UNSET_FLAGS(obj, flags) (GNT_MENU_FLAGS(obj) &= ~(flags))
typedef struct _GntMenu GntMenu;
typedef struct _GntMenuPriv GntMenuPriv;
typedef struct _GntMenuClass GntMenuClass;
--- a/gntmenuitem.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntmenuitem.h Fri Apr 05 01:34:59 2019 +0000
@@ -39,10 +39,6 @@
#define GNT_IS_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENU_ITEM))
#define GNT_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENU_ITEM, GntMenuItemClass))
-#define GNT_MENU_ITEM_FLAGS(obj) (GNT_MENU_ITEM(obj)->priv.flags)
-#define GNT_MENU_ITEM_SET_FLAGS(obj, flags) (GNT_MENU_ITEM_FLAGS(obj) |= flags)
-#define GNT_MENU_ITEM_UNSET_FLAGS(obj, flags) (GNT_MENU_ITEM_FLAGS(obj) &= ~(flags))
typedef struct _GntMenuItem GntMenuItem;
typedef struct _GntMenuItemPriv GntMenuItemPriv;
typedef struct _GntMenuItemClass GntMenuItemClass;
--- a/gntmenuitemcheck.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntmenuitemcheck.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_MENU_ITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_MENU_ITEM_CHECK))
#define GNT_MENU_ITEM_CHECK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheckClass))
-#define GNT_MENU_ITEM_CHECK_FLAGS(obj) (GNT_MENU_ITEM_CHECK(obj)->priv.flags)
-#define GNT_MENU_ITEM_CHECK_SET_FLAGS(obj, flags) (GNT_MENU_ITEM_CHECK_FLAGS(obj) |= flags)
-#define GNT_MENU_ITEM_CHECK_UNSET_FLAGS(obj, flags) (GNT_MENU_ITEM_CHECK_FLAGS(obj) &= ~(flags))
typedef struct _GntMenuItemCheck GntMenuItemCheck;
typedef struct _GntMenuItemCheckPriv GntMenuItemCheckPriv;
typedef struct _GntMenuItemCheckClass GntMenuItemCheckClass;
--- a/gntslider.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntslider.h Fri Apr 05 01:34:59 2019 +0000
@@ -40,10 +40,6 @@
#define GNT_IS_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_SLIDER))
#define GNT_SLIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_SLIDER, GntSliderClass))
-#define GNT_SLIDER_FLAGS(obj) (GNT_SLIDER(obj)->priv.flags)
-#define GNT_SLIDER_SET_FLAGS(obj, flags) (GNT_SLIDER_FLAGS(obj) |= flags)
-#define GNT_SLIDER_UNSET_FLAGS(obj, flags) (GNT_SLIDER_FLAGS(obj) &= ~(flags))
typedef struct _GntSlider GntSlider;
typedef struct _GntSliderPriv GntSliderPriv;
typedef struct _GntSliderClass GntSliderClass;
--- a/gnttextview.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gnttextview.h Fri Apr 05 01:34:59 2019 +0000
@@ -41,10 +41,6 @@
#define GNT_IS_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TEXT_VIEW))
#define GNT_TEXT_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TEXT_VIEW, GntTextViewClass))
-#define GNT_TEXT_VIEW_FLAGS(obj) (GNT_TEXT_VIEW(obj)->priv.flags)
-#define GNT_TEXT_VIEW_SET_FLAGS(obj, flags) (GNT_TEXT_VIEW_FLAGS(obj) |= flags)
-#define GNT_TEXT_VIEW_UNSET_FLAGS(obj, flags) (GNT_TEXT_VIEW_FLAGS(obj) &= ~(flags))
typedef struct _GntTextView GntTextView;
typedef struct _GntTextViewPriv GntTextViewPriv;
typedef struct _GntTextViewClass GntTextViewClass;
--- a/gntwidget.c Thu Apr 04 00:03:08 2019 -0400
+++ b/gntwidget.c Fri Apr 05 01:34:59 2019 +0000
@@ -561,3 +561,210 @@
gnt_style_get_bool(GNT_STYLE_SHADOW, FALSE));
+gnt_widget_in_destruction(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DESTROYING); +gnt_widget_set_drawing(GntWidget *widget, gboolean drawing) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DRAWING); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DRAWING); +gnt_widget_get_drawing(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DRAWING); +gnt_widget_set_mapped(GntWidget *widget, gboolean mapped) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED); +gnt_widget_get_mapped(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED); +gnt_widget_set_has_border(GntWidget *widget, gboolean has_border) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER); +gnt_widget_get_has_border(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER); +gnt_widget_set_has_shadow(GntWidget *widget, gboolean has_shadow) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_SHADOW); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW); +gnt_widget_get_has_shadow(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW); +gnt_widget_set_has_focus(GntWidget *widget, gboolean has_focus) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS); +gnt_widget_get_has_focus(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS); +gnt_widget_set_is_urgent(GntWidget *widget, gboolean urgent) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_URGENT); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_URGENT); +gnt_widget_get_is_urgent(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_URGENT); +gnt_widget_set_grow_x(GntWidget *widget, gboolean grow_x) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_GROW_X); +gnt_widget_get_grow_x(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X); +gnt_widget_set_grow_y(GntWidget *widget, gboolean grow_y) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_Y); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_GROW_Y); +gnt_widget_get_grow_y(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y); +gnt_widget_set_transient(GntWidget *widget, gboolean transient) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_TRANSIENT); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_TRANSIENT); +gnt_widget_get_transient(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_TRANSIENT); +gnt_widget_set_disable_actions(GntWidget *widget, gboolean disable_actions) + g_return_if_fail(GNT_IS_WIDGET(widget)); + GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS); + GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS); +gnt_widget_get_disable_actions(GntWidget *widget) + g_return_val_if_fail(GNT_IS_WIDGET(widget), FALSE); + return GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DISABLE_ACTIONS); --- a/gntwidget.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntwidget.h Fri Apr 05 01:34:59 2019 +0000
@@ -283,8 +283,8 @@
- * @set: %TRUE of focus should be given to the widget, %FALSE if
- * focus should be removed.
+ * @set: %TRUE if focus should be given to the widget, %FALSE if focus * Give or remove focus to a widget.
@@ -356,6 +356,266 @@
gboolean gnt_widget_has_shadow(GntWidget *widget);
+ * gnt_widget_in_destruction + * Returns whether the widget is currently being destroyed. + * This information can sometimes be used to avoid doing unnecessary work. + * Returns: %TRUE if the widget is being destroyed. +gboolean gnt_widget_in_destruction(GntWidget *widget); + * gnt_widget_set_drawing + * @drawing: Whether or not the widget is being drawn + * Marks the widget as being drawn (or not). +void gnt_widget_set_drawing(GntWidget *widget, gboolean drawing); + * gnt_widget_get_drawing + * Returns whether the widget is currently being drawn. + * This information can sometimes be used to avoid doing unnecessary work. + * Returns: %TRUE if the widget is being drawn. +gboolean gnt_widget_get_drawing(GntWidget *widget); + * gnt_widget_set_mapped + * @mapped: Whether or not the widget is mapped + * Marks the widget as being mapped (or not). + * This should generally only be called from the widget's "map" or "unmap" +void gnt_widget_set_mapped(GntWidget *widget, gboolean mapped); + * gnt_widget_get_mapped + * Whether widget is mapped or not. + * Returns: Whether the widget is mapped or not. +gboolean gnt_widget_get_mapped(GntWidget *widget); + * gnt_widget_set_has_border + * @has_border: Whether or not the widget has a border + * Sets the has-border property on widget to has_border. +void gnt_widget_set_has_border(GntWidget *widget, gboolean has_border); + * gnt_widget_get_has_border + * Returns the has-border property on widget. + * Returns: Whether the widget has a border or not. +gboolean gnt_widget_get_has_border(GntWidget *widget); + * gnt_widget_set_has_shadow + * @has_shadow: Whether or not the widget has a shadow + * Sets the has-shadow property on widget to has_shadow. Note, setting this + * property does not necessarily mean the widget will have a shadow, depending +void gnt_widget_set_has_shadow(GntWidget *widget, gboolean has_shadow); + * gnt_widget_get_has_shadow + * Returns the has-shadow property on widget. Note, this is a property of the + * widget, but does not necessarily mean the widget will have a shadow as that + * depends on its styling. Use @gnt_widget_set_has_shadow to determine + * whether the widget will actually have a shadow. + * Returns: Whether the widget has a shadow set or not. +gboolean gnt_widget_get_has_shadow(GntWidget *widget); + * gnt_widget_set_has_focus + * @has_focus: Whether or not the widget has focus + * Sets the has-focus flag on a widget. Note, setting this flag does not + * necessarily mean the widget will have focus. + * This is mostly for internal use; you probably want to use + * @gnt_widget_set_focus instead. +void gnt_widget_set_has_focus(GntWidget *widget, gboolean has_focus); + * gnt_widget_get_has_focus: + * Check whether a widget has the focus flag. + * This is mostly for internal use; you probably want to use + * @gnt_widget_has_focus instead. + * Returns: %TRUE if the widget's focus flag is set, %FALSE otherwise. +gboolean gnt_widget_get_has_focus(GntWidget *widget); + * gnt_widget_set_is_urgent: + * @widget: The widget to set the URGENT hint for + * @urgent: Whether the URGENT hint should be set or not + * Set the URGENT hint for a widget. +void gnt_widget_set_is_urgent(GntWidget *widget, gboolean urgent); + * gnt_widget_get_urgent + * Returns whether the widget has the URGENT hint set. + * Returns: Whether the URGENT hint is set or not. +gboolean gnt_widget_get_is_urgent(GntWidget *widget); + * gnt_widget_set_grow_x: + * @grow_x: Whether the widget should grow or not + * Whether widget should grow in the x direction. +void gnt_widget_set_grow_x(GntWidget *widget, gboolean grow_x); + * gnt_widget_get_grow_x + * Returns whether the widget should grow in the x direction. + * Returns: Whether widget should grow in the x direction. +gboolean gnt_widget_get_grow_x(GntWidget *widget); + * gnt_widget_set_grow_y: + * @grow_y: Whether the widget should grow or not + * Whether widget should grow in the y direction. +void gnt_widget_set_grow_y(GntWidget *widget, gboolean grow_y); + * gnt_widget_get_grow_y + * Returns whether the widget should grow in the y direction. + * Returns: Whether widget should grow in the y direction. +gboolean gnt_widget_get_grow_y(GntWidget *widget); + * gnt_widget_set_transient: + * @transient: Whether the widget is transient or not + * Whether the widget should be transient. +void gnt_widget_set_transient(GntWidget *widget, gboolean transient); + * gnt_widget_get_transient + * Returns whether the widget is transient. + * Returns: Whether the widget should be transient. +gboolean gnt_widget_get_transient(GntWidget *widget); + * gnt_widget_set_disable_actions: + * @disable_actions: Whether the widget actions should be disabled or not + * Whether widget actions should be disabled. +void gnt_widget_set_disable_actions(GntWidget *widget, + gboolean disable_actions); + * gnt_widget_get_disable_actions + * Returns whether the widget actions are disabled. + * Returns: Whether the widget actions are disabled. +gboolean gnt_widget_get_disable_actions(GntWidget *widget); #endif /* GNT_WIDGET_H */
--- a/gntwindow.h Thu Apr 04 00:03:08 2019 -0400
+++ b/gntwindow.h Fri Apr 05 01:34:59 2019 +0000
@@ -42,10 +42,6 @@
#define GNT_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_WINDOW))
#define GNT_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_WINDOW, GntWindowClass))
-#define GNT_WINDOW_FLAGS(obj) (GNT_WINDOW(obj)->priv.flags)
-#define GNT_WINDOW_SET_FLAGS(obj, flags) (GNT_WINDOW_FLAGS(obj) |= flags)
-#define GNT_WINDOW_UNSET_FLAGS(obj, flags) (GNT_WINDOW_FLAGS(obj) &= ~(flags))
typedef struct _GntWindow GntWindow;
typedef struct _GntWindowPriv GntWindowPriv;
typedef struct _GntWindowClass GntWindowClass;