Mercurial > dwindows
comparison gtk4/dw.c @ 2284:3361ce6070ce
Add DW_FEATURE_TASK_BAR to the feature tests, for taskbar icon support.
Not having this earlier was probably an oversight, but added it because GTK4
removes the widget that allowed this support.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 03 Feb 2021 21:44:15 +0000 |
parents | b045bb67922d |
children | 2d282d8fe911 |
comparison
equal
deleted
inserted
replaced
2283:0c88059df8e9 | 2284:3361ce6070ce |
---|---|
2224 */ | 2224 */ |
2225 void dw_menu_destroy(HMENUI *menu) | 2225 void dw_menu_destroy(HMENUI *menu) |
2226 { | 2226 { |
2227 if(menu && *menu) | 2227 if(menu && *menu) |
2228 { | 2228 { |
2229 GtkWidget *window; | 2229 GtkWidget *window = NULL; |
2230 | 2230 |
2231 /* If it is a menu bar, try to delete the reference to it */ | 2231 /* If it is a menu bar, try to delete the reference to it */ |
2232 if(GTK_IS_POPOVER_MENU_BAR(*menu) && | 2232 if(GTK_IS_POPOVER_MENU_BAR(*menu) && |
2233 (window = GTK_WIDGET(g_object_get_data(G_OBJECT(*menu), "_dw_window")))) | 2233 (window = GTK_WIDGET(g_object_get_data(G_OBJECT(*menu), "_dw_window")))) |
2234 g_object_set_data(G_OBJECT(window), "_dw_menubar", NULL); | 2234 g_object_set_data(G_OBJECT(window), "_dw_menubar", NULL); |
2235 /* Actually destroy the menu */ | 2235 /* Actually destroy the menu */ |
2236 if(GTK_IS_WIDGET(*menu)) | 2236 if(GTK_IS_WIDGET(*menu) && window) |
2237 { | 2237 { |
2238 GtkWidget *box = GTK_WIDGET(g_object_get_data(G_OBJECT(window), "_dw_grid")); | 2238 GtkWidget *box = GTK_WIDGET(g_object_get_data(G_OBJECT(window), "_dw_grid")); |
2239 if(box && GTK_IS_GRID(box)) | 2239 if(box && GTK_IS_GRID(box)) |
2240 gtk_grid_remove(GTK_GRID(box), GTK_WIDGET(*menu)); | 2240 gtk_grid_remove(GTK_GRID(box), GTK_WIDGET(*menu)); |
2241 else | 2241 else |