tGtkCheckMenuItems now work properly under Win32. - vaccinewars - be a doctor a… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 9bdd4c619d23fefacbd8a82acde3cb3c70249d9e | |
parent 6222966b358a7194252e2836b563772b5d66732d | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 26 Aug 2002 12:30:36 +0000 | |
GtkCheckMenuItems now work properly under Win32. | |
Diffstat: | |
M src/gtkport/gtkport.c | 8 ++++++-- | |
M src/gui_client/gtk_client.c | 2 -- | |
2 files changed, 6 insertions(+), 4 deletions(-) | |
--- | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -3818,10 +3818,14 @@ void gtk_menu_item_realize(GtkWidget *widget) | |
mii.hSubMenu = GTK_MENU_SHELL(menu_item->submenu)->menu; | |
} | |
mii.fType = MFT_STRING; | |
- if (GTK_WIDGET_SENSITIVE(widget)) | |
+ if (GTK_WIDGET_SENSITIVE(widget)) { | |
mii.fState = MFS_ENABLED; | |
- else | |
+ } else { | |
mii.fState = MFS_GRAYED; | |
+ } | |
+ if (menu_item->check) { | |
+ mii.fState |= (menu_item->active ? MFS_CHECKED : MFS_UNCHECKED); | |
+ } | |
mii.wID = menu_item->ID; | |
mii.dwTypeData = (LPTSTR)menu_item->text; | |
mii.cch = strlen(menu_item->text); | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -280,8 +280,6 @@ void ToggleSound(GtkWidget *widget, gpointer data) | |
if (widget) { | |
enable = GTK_CHECK_MENU_ITEM(widget)->active; | |
SoundEnable(enable); | |
- } else { | |
- g_print("widget is NULL\n"); | |
} | |
} | |