tDon't use deprecated GTK_WIDGET_VISIBLE() - vaccinewars - be a doctor and try … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit a2e4409e98b7c8c00b06fe2a29fc655bbef614f6 | |
parent 21f870e3d9e5747082ef99b7aa686f3d59d899f3 | |
Author: Ben Webb <[email protected]> | |
Date: Fri, 20 Nov 2020 00:53:49 -0800 | |
Don't use deprecated GTK_WIDGET_VISIBLE() | |
Diffstat: | |
M src/gtkport/gtkport.c | 37 ++++++++++++++++++-----------… | |
M src/gtkport/gtkport.h | 2 +- | |
M src/gui_client/gtk_client.c | 2 +- | |
3 files changed, 23 insertions(+), 18 deletions(-) | |
--- | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -1320,11 +1320,16 @@ void gtk_widget_show(GtkWidget *widget) | |
gtk_widget_show_full(widget, TRUE); | |
} | |
+gboolean gtk_widget_get_visible(GtkWidget *widget) | |
+{ | |
+ return GTK_WIDGET_FLAGS(widget) & GTK_VISIBLE != 0; | |
+} | |
+ | |
void gtk_widget_show_full(GtkWidget *widget, gboolean recurse) | |
{ | |
GtkAllocation alloc; | |
- if (GTK_WIDGET_VISIBLE(widget)) | |
+ if (gtk_widget_get_visible(widget)) | |
return; | |
GTK_WIDGET_SET_FLAGS(widget, GTK_VISIBLE); | |
t@@ -1364,7 +1369,7 @@ void gtk_widget_hide_full(GtkWidget *widget, gboolean re… | |
GtkRequisition req; | |
GtkWidget *window; | |
- if (!GTK_WIDGET_VISIBLE(widget)) | |
+ if (!gtk_widget_get_visible(widget)) | |
return; | |
if (recurse) | |
t@@ -1397,7 +1402,7 @@ void gtk_widget_set_focus(GtkWidget *widget) | |
GtkWidget *window; | |
if (!widget || !GTK_WIDGET_CAN_FOCUS(widget) | |
- || !GTK_WIDGET_SENSITIVE(widget) || !GTK_WIDGET_VISIBLE(widget)) | |
+ || !GTK_WIDGET_SENSITIVE(widget) || !gtk_widget_get_visible(widget)) | |
return; | |
window = gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW); | |
gtk_window_update_focus(GTK_WINDOW(window)); | |
t@@ -1422,7 +1427,7 @@ static BOOL CALLBACK SetFocusEnum(HWND hWnd, LPARAM data) | |
widget = GTK_WIDGET(myGetWindowLong(hWnd, GWLP_USERDATA)); | |
if (!widget || !GTK_WIDGET_CAN_FOCUS(widget) || | |
- !GTK_WIDGET_SENSITIVE(widget) || !GTK_WIDGET_VISIBLE(widget) || | |
+ !GTK_WIDGET_SENSITIVE(widget) || !gtk_widget_get_visible(widget) || | |
window->focus == widget) { | |
return TRUE; | |
} else { | |
t@@ -1540,7 +1545,7 @@ void gtk_widget_size_request(GtkWidget *widget, | |
GtkRequisition req; | |
requisition->width = requisition->height = 0; | |
- if (GTK_WIDGET_VISIBLE(widget)) { | |
+ if (gtk_widget_get_visible(widget)) { | |
gtk_signal_emit(GTK_OBJECT(widget), "size_request", requisition); | |
} | |
if (requisition->width < widget->usize.width) | |
t@@ -2220,7 +2225,7 @@ static void EnableParent(GtkWindow *window) | |
for (list = WindowList; list; list = g_slist_next(list)) { | |
listwin = GTK_WINDOW(list->data); | |
if (listwin != window && listwin->modal | |
- && GTK_WIDGET_VISIBLE(GTK_WIDGET(listwin)) | |
+ && gtk_widget_get_visible(GTK_WIDGET(listwin)) | |
&& GTK_WIDGET(listwin)->parent == parent) | |
return; | |
} | |
t@@ -2273,7 +2278,7 @@ void gtk_hbox_size_request(GtkWidget *widget, GtkRequisi… | |
for (children = GTK_BOX(widget)->children; children; | |
children = g_list_next(children)) { | |
child = (GtkBoxChild *)(children->data); | |
- if (child && child->widget && GTK_WIDGET_VISIBLE(child->widget)) { | |
+ if (child && child->widget && gtk_widget_get_visible(child->widget)) { | |
if (first) { | |
first = FALSE; | |
} else { | |
t@@ -2311,7 +2316,7 @@ void gtk_vbox_size_request(GtkWidget *widget, GtkRequisi… | |
for (children = GTK_BOX(widget)->children; children; | |
children = g_list_next(children)) { | |
child = (GtkBoxChild *)(children->data); | |
- if (child && child->widget && GTK_WIDGET_VISIBLE(child->widget)) { | |
+ if (child && child->widget && gtk_widget_get_visible(child->widget)) { | |
if (first) { | |
first = FALSE; | |
} else { | |
t@@ -2347,7 +2352,7 @@ static void gtk_box_count_children(GtkBox *box, gint16 a… | |
for (children = box->children; children; | |
children = g_list_next(children)) { | |
child = (GtkBoxChild *)(children->data); | |
- if (child && child->widget && GTK_WIDGET_VISIBLE(child->widget) && | |
+ if (child && child->widget && gtk_widget_get_visible(child->widget) && | |
child->expand) | |
NumCanExpand++; | |
} | |
t@@ -2413,7 +2418,7 @@ void gtk_hbox_set_size(GtkWidget *widget, GtkAllocation … | |
for (children = box->children; children; | |
children = g_list_next(children)) { | |
child = (GtkBoxChild *)(children->data); | |
- if (child && child->widget && GTK_WIDGET_VISIBLE(child->widget)) { | |
+ if (child && child->widget && gtk_widget_get_visible(child->widget)) { | |
gtk_box_size_child(box, child, extra, maxpos, | |
box->homogeneous ? box->maxreq : | |
child->widget->requisition.width, | |
t@@ -2449,7 +2454,7 @@ void gtk_vbox_set_size(GtkWidget *widget, GtkAllocation … | |
for (children = box->children; children; | |
children = g_list_next(children)) { | |
child = (GtkBoxChild *)(children->data); | |
- if (child && child->widget && GTK_WIDGET_VISIBLE(child->widget)) { | |
+ if (child && child->widget && gtk_widget_get_visible(child->widget)) { | |
gtk_box_size_child(box, child, extra, maxpos, | |
box->homogeneous ? box->maxreq : | |
child->widget->requisition.height, | |
t@@ -2773,7 +2778,7 @@ void gtk_widget_show_all_full(GtkWidget *widget, gboolea… | |
gtk_signal_emit(GTK_OBJECT(widget), "show_all", hWndOnly); | |
if (hWndOnly) { | |
- if (GTK_WIDGET_VISIBLE(widget)) { | |
+ if (gtk_widget_get_visible(widget)) { | |
gtk_signal_emit(GTK_OBJECT(widget), "show"); | |
if (widget->hWnd) | |
ShowWindow(widget->hWnd, SW_SHOWNORMAL); | |
t@@ -3019,7 +3024,7 @@ static void gtk_table_get_size_children(GtkTable *table, | |
child_wid = child->widget; | |
if (child_wid && child->left_attach < child->right_attach | |
&& child->top_attach < child->bottom_attach | |
- && GTK_WIDGET_VISIBLE(child_wid)) { | |
+ && gtk_widget_get_visible(child_wid)) { | |
child_req.width = child_wid->requisition.width; | |
child_req.height = child_wid->requisition.height; | |
child_req.height /= (child->bottom_attach - child->top_attach); | |
t@@ -3139,7 +3144,7 @@ void gtk_table_set_size(GtkWidget *widget, GtkAllocation… | |
child_wid = child->widget; | |
if (child_wid && child->left_attach < child->right_attach && | |
child->top_attach < child->bottom_attach && | |
- GTK_WIDGET_VISIBLE(child_wid)) { | |
+ gtk_widget_get_visible(child_wid)) { | |
if (child->xoptions & GTK_SHRINK) { | |
for (i = child->left_attach; i < child->right_attach; i++) { | |
colopt[i] |= GTK_SHRINK; | |
t@@ -3185,7 +3190,7 @@ void gtk_table_set_size(GtkWidget *widget, GtkAllocation… | |
for (children = table->children; children; | |
children = g_list_next(children)) { | |
child = (GtkTableChild *)(children->data); | |
- if (!child || !child->widget || !GTK_WIDGET_VISIBLE(child->widget)) | |
+ if (!child || !child->widget || !gtk_widget_get_visible(child->widget)) | |
continue; | |
child_alloc.x = allocation->x + border_width; | |
child_alloc.y = allocation->y + border_width; | |
t@@ -4086,7 +4091,7 @@ void gtk_notebook_size_request(GtkWidget *widget, | |
children = g_slist_next(children)) { | |
note_child = (GtkNotebookChild *)(children->data); | |
if (note_child && note_child->child && | |
- GTK_WIDGET_VISIBLE(note_child->child)) { | |
+ gtk_widget_get_visible(note_child->child)) { | |
child_req = ¬e_child->child->requisition; | |
if (child_req->width > requisition->width) | |
requisition->width = child_req->width; | |
diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h | |
t@@ -459,7 +459,6 @@ extern HINSTANCE hInst; | |
#define GTK_OBJECT_FLAGS(obj) (GTK_OBJECT(obj)->flags) | |
#define GTK_WIDGET_FLAGS(wid) (GTK_OBJECT_FLAGS(wid)) | |
#define GTK_WIDGET_REALIZED(wid) ((GTK_WIDGET_FLAGS(wid)>K_REALIZED) != 0) | |
-#define GTK_WIDGET_VISIBLE(wid) ((GTK_WIDGET_FLAGS(wid)>K_VISIBLE) != 0) | |
#define GTK_WIDGET_SENSITIVE(wid) ((GTK_WIDGET_FLAGS(wid)>K_SENSITIVE) != 0) | |
#define GTK_WIDGET_CAN_FOCUS(wid) ((GTK_WIDGET_FLAGS(wid)>K_CAN_FOCUS) != 0) | |
#define GTK_WIDGET_HAS_FOCUS(wid) ((GTK_WIDGET_FLAGS(wid)>K_HAS_FOCUS) != 0) | |
t@@ -468,6 +467,7 @@ extern HINSTANCE hInst; | |
typedef int GdkEvent; | |
+gboolean gtk_widget_get_visible(GtkWidget *widget); | |
void gtk_widget_show(GtkWidget *widget); | |
void gtk_widget_show_all(GtkWidget *widget); | |
void gtk_widget_hide_all(GtkWidget *widget); | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -1146,7 +1146,7 @@ void DisplayFightMessage(char *Data) | |
if (IsShowingDealDrugs) { | |
gtk_widget_destroy(DealDialog.dialog); | |
} | |
- if (!GTK_WIDGET_VISIBLE(FightDialog)) { | |
+ if (!gtk_widget_get_visible(FightDialog)) { | |
gtk_widget_show(FightDialog); | |
} | |
} else { |