Use flag accessor functions everywhere.
--- a/gntbox.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntbox.c Fri Apr 05 04:24:55 2019 -0400
@@ -114,8 +114,7 @@
- if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+ if (gnt_widget_get_has_border(widget)) { @@ -320,9 +319,9 @@
/* This dance is necessary to make sure that the child widgets get a chance
to trigger their bindings first */
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_disable_actions(widget, FALSE); ret = gnt_widget_key_pressed(widget, text);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_disable_actions(widget, TRUE); @@ -621,9 +620,12 @@
GntBox *box = GNT_BOX(widget);
/* Initially make both the height and width resizable.
* Update the flags as necessary when widgets are added to it. */
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_DISABLE_ACTIONS);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_grow_x(widget, TRUE); + gnt_widget_set_grow_y(widget, TRUE); + gnt_widget_set_take_focus(widget, TRUE); + gnt_widget_set_disable_actions(widget, TRUE); + gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); @@ -702,16 +704,10 @@
void gnt_box_set_toplevel(GntBox *box, gboolean set)
GntWidget *widget = GNT_WIDGET(box);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_has_border(widget, set); + gnt_widget_set_has_shadow(widget, set); + gnt_widget_set_take_focus(widget, set); void gnt_box_sync_children(GntBox *box)
@@ -824,14 +820,14 @@
gnt_box_readjust(GNT_BOX(w));
- GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_MAPPED);
+ gnt_widget_set_mapped(w, FALSE); - GNT_WIDGET_UNSET_FLAGS(wid, GNT_WIDGET_MAPPED);
+ gnt_widget_set_mapped(wid, FALSE); --- a/gntbutton.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntbutton.c Fri Apr 05 04:24:55 2019 -0400
@@ -133,10 +133,12 @@
widget->priv.minh = small_button ? 1 : 3;
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_grow_x(widget, FALSE); + gnt_widget_set_grow_y(widget, FALSE); /******************************************************************************
--- a/gntcheckbox.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntcheckbox.c Fri Apr 05 04:24:55 2019 -0400
@@ -117,8 +117,8 @@
GntWidget *widget = GNT_WIDGET(instance);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); /******************************************************************************
--- a/gntcombobox.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntcombobox.c Fri Apr 05 04:24:55 2019 -0400
@@ -142,7 +142,7 @@
parent->priv.width = widget->priv.width;
parent->priv.height = height + 2;
- GNT_WIDGET_UNSET_FLAGS(parent, GNT_WIDGET_INVISIBLE);
+ gnt_widget_set_visible(parent, TRUE); @@ -303,12 +303,15 @@
GntWidget *widget = GNT_WIDGET(instance);
GntComboBox *combo = GNT_COMBO_BOX(instance);
- GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance),
- GNT_WIDGET_GROW_X | GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_grow_x(widget, TRUE); + gnt_widget_set_take_focus(widget, TRUE); + gnt_widget_set_has_shadow(widget, FALSE); combo->dropdown = gnt_tree_new();
box = gnt_box_new(FALSE, FALSE);
- GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_TRANSIENT);
+ gnt_widget_set_has_shadow(box, FALSE); + gnt_widget_set_has_border(box, FALSE); + gnt_widget_set_transient(box, TRUE); gnt_box_set_pad(GNT_BOX(box), 0);
gnt_box_add_widget(GNT_BOX(box), combo->dropdown);
--- a/gntentry.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntentry.c Fri Apr 05 04:24:55 2019 -0400
@@ -210,7 +210,7 @@
gnt_tree_set_compare_func(GNT_TREE(entry->ddown), (GCompareFunc)g_utf8_collate);
gnt_box_add_widget(GNT_BOX(box), entry->ddown);
- GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
+ gnt_widget_set_transient(box, TRUE); gnt_widget_get_position(GNT_WIDGET(entry), &x, &y);
@@ -1050,9 +1050,10 @@
entry->killring = new_killring();
entry->search = g_new0(GntEntrySearch, 1);
- GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
- GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
- GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry), GNT_WIDGET_GROW_X);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_take_focus(widget, TRUE); + gnt_widget_set_grow_x(widget, TRUE); --- a/gntlabel.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntlabel.c Fri Apr 05 04:24:55 2019 -0400
@@ -146,8 +146,9 @@
GntWidget *widget = GNT_WIDGET(instance);
gnt_widget_set_take_focus(widget, FALSE);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_grow_x(widget, TRUE); --- a/gntline.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntline.c Fri Apr 05 04:24:55 2019 -0400
@@ -80,9 +80,9 @@
line->vertical = g_value_get_boolean(value);
- GNT_WIDGET_SET_FLAGS(line, GNT_WIDGET_GROW_Y);
+ gnt_widget_set_grow_y(GNT_WIDGET(line), TRUE); - GNT_WIDGET_SET_FLAGS(line, GNT_WIDGET_GROW_X);
+ gnt_widget_set_grow_x(GNT_WIDGET(line), TRUE); @@ -129,7 +129,8 @@
gnt_line_init(GTypeInstance *instance, gpointer class)
GntWidget *widget = GNT_WIDGET(instance);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_has_border(widget, FALSE); --- a/gntmain.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntmain.c Fri Apr 05 04:24:55 2019 -0400
@@ -602,7 +602,7 @@
if (wm->cws->ordered && wm->cws->ordered->data == widget)
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_URGENT);
+ gnt_widget_set_is_urgent(widget, TRUE); gnt_wm_update_window(wm, widget);
@@ -672,7 +672,7 @@
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(wm->menu), GNT_WIDGET_INVISIBLE);
+ gnt_widget_set_visible(GNT_WIDGET(wm->menu), TRUE); gnt_widget_draw(GNT_WIDGET(wm->menu));
g_signal_connect(G_OBJECT(wm->menu), "hide", G_CALLBACK(reset_menu), NULL);
--- a/gntmenu.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntmenu.c Fri Apr 05 04:24:55 2019 -0400
@@ -225,7 +225,7 @@
item->priv.y = widget->priv.y + gnt_tree_get_selection_visible_line(GNT_TREE(menu));
gnt_widget_set_position(GNT_WIDGET(sub), item->priv.x, item->priv.y);
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(sub), GNT_WIDGET_INVISIBLE);
+ gnt_widget_set_visible(GNT_WIDGET(sub), TRUE); gnt_widget_draw(GNT_WIDGET(sub));
@@ -440,9 +440,12 @@
gnt_menu_init(GTypeInstance *instance, gpointer class)
GntWidget *widget = GNT_WIDGET(instance);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER |
- GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_TRANSIENT | GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_take_focus(widget, TRUE); + gnt_widget_set_transient(widget, TRUE); + gnt_widget_set_disable_actions(widget, TRUE); /******************************************************************************
@@ -494,7 +497,7 @@
gnt_tree_set_column_resizable(GNT_TREE(widget), ITEM_TRIGGER, FALSE);
gnt_tree_set_col_width(GNT_TREE(widget), ITEM_SUBMENU, 1);
gnt_tree_set_column_resizable(GNT_TREE(widget), ITEM_SUBMENU, FALSE);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_border(widget, TRUE); --- a/gntprogressbar.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntprogressbar.c Fri Apr 05 04:24:55 2019 -0400
@@ -134,7 +134,9 @@
GntProgressBarPrivate *priv = GNT_PROGRESS_BAR_GET_PRIVATE (GNT_PROGRESS_BAR (widget));
gnt_widget_set_take_focus (widget, FALSE);
- GNT_WIDGET_SET_FLAGS (widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_X);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_grow_x(widget, TRUE); @@ -186,8 +188,9 @@
priv->fraction = fraction;
- if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(pbar))) { gnt_widget_draw(GNT_WIDGET(pbar));
@@ -200,19 +203,20 @@
priv->orientation = orientation;
if (orientation == GNT_PROGRESS_LEFT_TO_RIGHT ||
orientation == GNT_PROGRESS_RIGHT_TO_LEFT) {
- GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_X);
- GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
+ gnt_widget_set_grow_x(widget, TRUE); + gnt_widget_set_grow_y(widget, FALSE); - GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_X);
- GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
+ gnt_widget_set_grow_x(widget, FALSE); + gnt_widget_set_grow_y(widget, TRUE); - if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
- gnt_widget_draw(GNT_WIDGET(pbar));
+ if (gnt_widget_get_mapped(widget)) { + gnt_widget_draw(widget); --- a/gntslider.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntslider.c Fri Apr 05 04:24:55 2019 -0400
@@ -226,7 +226,9 @@
gnt_slider_init(GTypeInstance *instance, gpointer class)
GntWidget *widget = GNT_WIDGET(instance);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_take_focus(widget, TRUE); @@ -271,9 +273,9 @@
slider->vertical = vertical;
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_Y);
+ gnt_widget_set_grow_y(widget, TRUE); - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X);
+ gnt_widget_set_grow_x(widget, TRUE); gnt_slider_set_range(slider, max, min);
--- a/gnttextview.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gnttextview.c Fri Apr 05 04:24:55 2019 -0400
@@ -391,7 +391,7 @@
view->string = g_string_set_size(view->string, string->len);
- GNT_WIDGET_SET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
+ gnt_widget_set_drawing(GNT_WIDGET(view), TRUE); for (; back; back = back->prev) {
@@ -420,7 +420,7 @@
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
+ gnt_widget_set_drawing(GNT_WIDGET(view), FALSE); if (GNT_WIDGET(view)->window)
gnt_widget_draw(GNT_WIDGET(view));
g_string_free(string, TRUE);
@@ -456,8 +456,10 @@
GntTextView *view = GNT_TEXT_VIEW(widget);
GntTextLine *line = g_new0(GntTextLine, 1);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW |
- GNT_WIDGET_GROW_Y | GNT_WIDGET_GROW_X);
+ gnt_widget_set_has_border(widget, FALSE); + gnt_widget_set_has_shadow(widget, FALSE); + gnt_widget_set_grow_x(widget, TRUE); + gnt_widget_set_grow_y(widget, TRUE); view->string = g_string_new(NULL);
--- a/gnttree.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gnttree.c Fri Apr 05 04:24:55 2019 -0400
@@ -790,7 +790,7 @@
g_string_free(tree->priv->search, TRUE);
tree->priv->search = NULL;
tree->priv->search_timeout = 0;
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_disable_actions(GNT_WIDGET(tree), FALSE); @@ -939,7 +939,7 @@
GntTree *tree = GNT_TREE(bindable);
- GNT_WIDGET_SET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_disable_actions(GNT_WIDGET(tree), TRUE); tree->priv->search = g_string_new(NULL);
tree->priv->search_timeout = g_timeout_add_seconds(SEARCH_TIMEOUT_S, search_timeout, tree);
@@ -951,7 +951,7 @@
GntTree *tree = GNT_TREE(bindable);
if (tree->priv->search == NULL)
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
+ gnt_widget_set_disable_actions(GNT_WIDGET(tree), FALSE); @@ -1131,8 +1131,10 @@
GntTree *tree = GNT_TREE(widget);
tree->show_separator = TRUE;
tree->priv = g_new0(GntTreePriv, 1);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y |
- GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_grow_x(widget, TRUE); + gnt_widget_set_grow_y(widget, TRUE); + gnt_widget_set_has_shadow(widget, FALSE); gnt_widget_set_take_focus(widget, TRUE);
--- a/gntutils.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntutils.c Fri Apr 05 04:24:55 2019 -0400
@@ -325,10 +325,7 @@
if (sscanf(prop, "%d", &val) == 1) {
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_border(widget, !!val); @@ -337,10 +334,7 @@
if (sscanf(prop, "%d", &val) == 1) {
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_border(widget, !!val); --- a/gntwidget.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntwidget.c Fri Apr 05 04:24:55 2019 -0400
@@ -68,7 +68,7 @@
/* Get some default size for the widget */
g_signal_emit(widget, signals[SIG_MAP], 0);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
+ gnt_widget_set_mapped(widget, TRUE); @@ -83,8 +83,9 @@
gnt_widget_focus_change(GntWidget *widget)
- if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED)
+ if (gnt_widget_get_mapped(widget)) { @@ -314,7 +315,7 @@
g_return_if_fail(GNT_IS_WIDGET(obj));
- if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING)) {
+ if (!gnt_widget_in_destruction(obj)) { GNT_WIDGET_SET_FLAGS(obj, GNT_WIDGET_DESTROYING);
@@ -336,11 +337,11 @@
gnt_widget_draw(GntWidget *widget)
- if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DRAWING))
+ if (gnt_widget_get_drawing(widget)) - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DRAWING);
- if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED)) {
+ gnt_widget_set_drawing(widget, TRUE); + if (!gnt_widget_get_mapped(widget)) { @@ -387,7 +388,7 @@
g_signal_emit(widget, signals[SIG_DRAW], 0);
gnt_widget_queue_update(widget);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DRAWING);
+ gnt_widget_set_drawing(widget, FALSE); @@ -433,8 +434,8 @@
mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
gnt_screen_release(widget);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED);
+ gnt_widget_set_visible(widget, FALSE); + gnt_widget_set_mapped(widget, FALSE); @@ -485,8 +486,7 @@
wbkgd(widget->window, gnt_color_pair(GNT_COLOR_NORMAL));
- if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+ if (gnt_widget_get_has_border(widget)) { /* - What's your point? */
mvwvline(widget->window, 0, 0, ACS_VLINE | gnt_color_pair(GNT_COLOR_NORMAL), widget->priv.height);
@@ -556,10 +556,11 @@
- if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(widget)) {
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
+ gnt_widget_set_mapped(widget, TRUE); @@ -571,18 +572,15 @@
if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_CAN_TAKE_FOCUS))
- if (set && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
+ if (set && !gnt_widget_get_has_focus(widget)) { + gnt_widget_set_has_focus(widget, TRUE); g_signal_emit(widget, signals[SIG_GIVE_FOCUS], 0);
+ } else if (!set && gnt_widget_get_has_focus(widget)) { + gnt_widget_set_has_focus(widget, FALSE); + g_signal_emit(widget, signals[SIG_LOST_FOCUS], 0); - else if (!set && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
- g_signal_emit(widget, signals[SIG_LOST_FOCUS], 0);
--- a/gntwindow.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntwindow.c Fri Apr 05 04:24:55 2019 -0400
@@ -120,8 +120,11 @@
GntWidget *widget = GNT_WIDGET(instance);
GntWindow *win = GNT_WINDOW(widget);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
- GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_has_border(widget, TRUE); + gnt_widget_set_has_shadow(widget, TRUE); + gnt_widget_set_take_focus(widget, TRUE); win->priv = g_new0(GntWindowPriv, 1);
win->priv->accels = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
--- a/gntwm.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntwm.c Fri Apr 05 04:24:55 2019 -0400
@@ -223,8 +223,8 @@
g_string_erase(text, text->len - 2, 2);
message = gnt_vbox_new(FALSE);
label = gnt_label_new_with_format(text->str, GNT_TEXT_FLAG_BOLD | GNT_TEXT_FLAG_HIGHLIGHT);
- GNT_WIDGET_UNSET_FLAGS(GNT_BOX(message), GNT_WIDGET_CAN_TAKE_FOCUS);
- GNT_WIDGET_SET_FLAGS(GNT_BOX(message), GNT_WIDGET_TRANSIENT);
+ gnt_widget_set_take_focus(message, FALSE); + gnt_widget_set_transient(message, TRUE); gnt_box_add_widget(GNT_BOX(message), label);
gnt_widget_set_name(message, "wm-message");
gnt_widget_set_position(message, 0, 0);
@@ -565,7 +565,7 @@
win = wm->_list.window = gnt_box_new(FALSE, FALSE);
gnt_box_set_toplevel(GNT_BOX(win), TRUE);
gnt_box_set_pad(GNT_BOX(win), 0);
- GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_TRANSIENT);
+ gnt_widget_set_transient(win, TRUE); tree = wm->_list.tree = gnt_tree_new();
gnt_box_add_widget(GNT_BOX(win), tree);
@@ -966,7 +966,7 @@
tree = wm->actions->tree;
gnt_box_set_title(GNT_BOX(win), "Actions");
- GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_border(tree, FALSE); /* XXX: Do we really want this? */
gnt_tree_set_compare_func(GNT_TREE(tree), compare_action);
@@ -1148,8 +1148,8 @@
text = gnt_get_clipboard_string();
clip = gnt_hwindow_new(FALSE);
- GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
- GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_transient(clip, TRUE); + gnt_widget_set_has_border(clip, FALSE); gnt_box_set_pad(GNT_BOX(clip), 0);
gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));
@@ -2198,7 +2198,7 @@
gnt_widget_set_focus(widget, TRUE);
- GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_URGENT);
+ gnt_widget_set_is_urgent(widget, FALSE); --- a/gntws.c Thu Apr 04 03:56:21 2019 -0400
+++ b/gntws.c Fri Apr 05 04:24:55 2019 -0400
@@ -44,7 +44,7 @@
widget_show(gpointer data, gpointer nodes)
GntNode *node = g_hash_table_lookup(nodes, data);
- GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(data), GNT_WIDGET_INVISIBLE);
+ gnt_widget_set_visible(GNT_WIDGET(data), TRUE); gnt_wm_copy_win(GNT_WIDGET(data), node);
--- a/test.c Thu Apr 04 03:56:21 2019 -0400
+++ b/test.c Fri Apr 05 04:24:55 2019 -0400
@@ -12,7 +12,8 @@
GntWidget *label = gnt_label_new("so wassup!!");
gnt_box_add_widget(GNT_BOX(box), label);
- GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_has_border(box, TRUE); + gnt_widget_set_has_shadow(box, TRUE); gnt_box_set_title(GNT_BOX(box), "This is a test");
@@ -103,7 +104,8 @@
gnt_tree_add_row_after(GNT_TREE(tree), "e", "e", "a", NULL);
gnt_tree_add_row_after(GNT_TREE(tree), "b", "b", "d", NULL);
- GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_has_border(hbox, TRUE); + gnt_widget_set_has_shadow(hbox, TRUE); gnt_box_set_title(GNT_BOX(hbox), "111111111111111111111111111111111111111111111111111111111111111This is the title …");
/*gnt_widget_set_take_focus(vbox, TRUE);*/
--- a/test/focus.c Thu Apr 04 03:56:21 2019 -0400
+++ b/test/focus.c Fri Apr 05 04:24:55 2019 -0400
@@ -60,7 +60,8 @@
gnt_tree_add_row_after(GNT_TREE(tree), "e", gnt_tree_create_row(GNT_TREE(tree), "e"), "a", NULL);
gnt_tree_add_choice(GNT_TREE(tree), "b", gnt_tree_create_row(GNT_TREE(tree), "b"), "d", NULL);
- GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+ gnt_widget_set_has_border(hbox, TRUE); + gnt_widget_set_has_shadow(hbox, TRUE); gnt_box_set_title(GNT_BOX(hbox), "\u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 \u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 ……\u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 …");
g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(toggled), NULL);
--- a/test/multiwin.c Thu Apr 04 03:56:21 2019 -0400
+++ b/test/multiwin.c Fri Apr 05 04:24:55 2019 -0400
@@ -28,7 +28,7 @@
tree = gnt_tree_new_with_columns(3);
gnt_tree_set_search_column(GNT_TREE(tree), 1);
- GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
+ gnt_widget_set_has_border(tree, FALSE); gnt_tree_set_column_titles(GNT_TREE(tree), "12345678901234567890", "column 2", "column3");
gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
gnt_widget_set_name(tree, "tree");
--- a/test/tv.c Thu Apr 04 03:56:21 2019 -0400
+++ b/test/tv.c Fri Apr 05 04:24:55 2019 -0400
@@ -75,7 +75,7 @@
entry = gnt_entry_new(NULL);
gnt_widget_set_name(entry, "entry");
- GNT_WIDGET_SET_FLAGS(entry, GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_take_focus(entry, TRUE); g_signal_connect(G_OBJECT(entry), "completion", G_CALLBACK(completion_cb), NULL);
--- a/wms/irssi.c Thu Apr 04 03:56:21 2019 -0400
+++ b/wms/irssi.c Fri Apr 05 04:24:55 2019 -0400
@@ -142,7 +142,7 @@
remove_border_set_position_size(GntWM *wm, GntWidget *win, int x, int y, int w, int h)
gnt_box_set_toplevel(GNT_BOX(win), FALSE);
- GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_take_focus(win, TRUE); gnt_widget_set_position(win, x, y);
mvwin(win->window, y, x);
--- a/wms/s.c Thu Apr 04 03:56:21 2019 -0400
+++ b/wms/s.c Fri Apr 05 04:24:55 2019 -0400
@@ -98,7 +98,7 @@
gnt_box_set_toplevel(GNT_BOX(win), FALSE);
- GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_CAN_TAKE_FOCUS);
+ gnt_widget_set_take_focus(win, TRUE); gnt_widget_set_position(win, x, y);
mvwin(win->window, y, x);