--- a/gntbox.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntbox.c Mon Apr 08 03:37:01 2019 -0400
@@ -785,7 +785,7 @@
box->focus = g_list_remove(box->focus, widget);
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(box), GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(box))) gnt_widget_draw(GNT_WIDGET(box));
--- a/gntcombobox.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntcombobox.c Mon Apr 08 03:37:01 2019 -0400
@@ -105,8 +105,7 @@
gnt_combo_box_size_request(GntWidget *widget)
- if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (!gnt_widget_get_mapped(widget)) { GntWidget *dd = GNT_COMBO_BOX(widget)->dropdown;
gnt_widget_size_request(dd);
widget->priv.height = 3; /* For now, a combobox will have border */
@@ -150,7 +149,7 @@
gnt_combo_box_key_pressed(GntWidget *widget, const char *text)
GntComboBox *box = GNT_COMBO_BOX(widget);
- gboolean showing = !!GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
+ gboolean showing = gnt_widget_get_mapped(box->dropdown->parent); @@ -216,7 +215,7 @@
gnt_combo_box_lost_focus(GntWidget *widget)
GntComboBox *combo = GNT_COMBO_BOX(widget);
- if (GNT_WIDGET_IS_FLAG_SET(combo->dropdown->parent, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(combo->dropdown->parent)) hide_popup(combo, FALSE);
widget_lost_focus(widget);
@@ -225,7 +224,7 @@
gnt_combo_box_clicked(GntWidget *widget, GntMouseEvent event, int x, int y)
GntComboBox *box = GNT_COMBO_BOX(widget);
- gboolean dshowing = GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
+ gboolean dshowing = gnt_widget_get_mapped(box->dropdown->parent); if (event == GNT_MOUSE_SCROLL_UP) {
@@ -254,7 +253,7 @@
dropdown_menu(GntBindable *b, GList *null)
- if (GNT_WIDGET_IS_FLAG_SET(GNT_COMBO_BOX(b)->dropdown->parent, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_COMBO_BOX(b)->dropdown->parent)) popup_dropdown(GNT_COMBO_BOX(b));
--- a/gntentry.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntentry.c Mon Apr 08 03:37:01 2019 -0400
@@ -307,8 +307,7 @@
gnt_entry_size_request(GntWidget *widget)
- if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (!gnt_widget_get_mapped(widget)) { @@ -1135,7 +1134,7 @@
if ((entry->cursor = entry->end - cursor) > entry->end)
entry->cursor = entry->end;
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(entry), GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(entry))) entry_redraw(GNT_WIDGET(entry));
--- a/gntfilesel.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntfilesel.c Mon Apr 08 03:37:01 2019 -0400
@@ -201,8 +201,9 @@
gnt_tree_remove_all(GNT_TREE(sel->files));
gnt_entry_set_text(GNT_ENTRY(sel->location), NULL);
if (sel->current == NULL) {
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(sel), GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(sel))) { gnt_widget_draw(GNT_WIDGET(sel));
@@ -242,8 +243,9 @@
g_list_foreach(files, (GFunc)gnt_file_free, NULL);
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(sel), GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(sel))) { gnt_widget_draw(GNT_WIDGET(sel));
--- a/gntslider.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntslider.c Mon Apr 08 03:37:01 2019 -0400
@@ -53,7 +53,7 @@
redraw_slider(GntSlider *slider)
GntWidget *widget = GNT_WIDGET(slider);
- if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(widget)) --- a/gnttextview.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gnttextview.c Mon Apr 08 03:37:01 2019 -0400
@@ -189,8 +189,7 @@
gnt_text_view_size_request(GntWidget *widget)
- if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (!gnt_widget_get_mapped(widget)) { gnt_widget_set_size(widget, 64, 20);
@@ -429,7 +428,7 @@
gnt_text_view_size_changed(GntWidget *widget, int w, int h)
- if (w != widget->priv.width && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED)) {
+ if (w != widget->priv.width && gnt_widget_get_mapped(widget)) { gnt_text_view_reflow(GNT_TEXT_VIEW(widget));
--- a/gnttree.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gnttree.c Mon Apr 08 03:37:01 2019 -0400
@@ -424,7 +424,7 @@
- if (!GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
+ if (!gnt_widget_get_mapped(GNT_WIDGET(tree))) pos = gnt_widget_get_has_border(widget) ? 1 : 0;
@@ -1578,9 +1578,11 @@
col->text = g_strdup(text ? text : "");
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED) &&
- get_distance(tree->top, row) >= 0 && get_distance(row, tree->bottom) >= 0)
+ if (gnt_widget_get_mapped(GNT_WIDGET(tree)) && + get_distance(tree->top, row) >= 0 && + get_distance(row, tree->bottom) >= 0) { @@ -1874,7 +1876,7 @@
- if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(GNT_WIDGET(tree))) --- a/gntwidget.c Mon Apr 08 03:30:52 2019 -0400
+++ b/gntwidget.c Mon Apr 08 03:37:01 2019 -0400
@@ -527,8 +527,7 @@
height = widget->priv.height;
- if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(widget)) { ret = gnt_widget_confirm_size(widget, width, height);
@@ -608,8 +607,9 @@
if (!g_object_get_data(G_OBJECT(widget), "gnt:queue_update"))
- if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+ if (gnt_widget_get_mapped(widget)) { gnt_screen_update(widget);
g_object_set_data(G_OBJECT(widget), "gnt:queue_update", NULL);