tDon't right-justify help menu - vaccinewars - be a doctor and try to vaccinate… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b3c69991013fc3e7b670203d26508e71362d5a23 | |
parent 987991af3ac6018b015551b65c2917eeb4c88970 | |
Author: Ben Webb <[email protected]> | |
Date: Thu, 3 Dec 2020 22:25:40 -0800 | |
Don't right-justify help menu | |
gtk_menu_item_set_right_justified() is deprecated, | |
and most modern operating systems don't right-align | |
tthe Help menu anyway, so place it next to the | |
other menus. | |
Diffstat: | |
M src/gtkport/gtkport.c | 6 ------ | |
M src/gtkport/gtkport.h | 2 -- | |
M src/gtkport/itemfactory.c | 3 --- | |
M src/gui_client/gtk_client.c | 2 +- | |
4 files changed, 1 insertion(+), 12 deletions(-) | |
--- | |
diff --git a/src/gtkport/gtkport.c b/src/gtkport/gtkport.c | |
t@@ -3706,12 +3706,6 @@ GtkWidget *gtk_menu_item_new_with_label(const gchar *la… | |
return GTK_WIDGET(menu_item); | |
} | |
-void gtk_menu_item_set_right_justified(GtkMenuItem *menu_item, | |
- gboolean right_justified) | |
-{ | |
- /* noop */ | |
-} | |
- | |
void gtk_menu_item_set_submenu(GtkMenuItem *menu_item, GtkWidget *submenu) | |
{ | |
menu_item->submenu = GTK_MENU(submenu); | |
diff --git a/src/gtkport/gtkport.h b/src/gtkport/gtkport.h | |
t@@ -444,8 +444,6 @@ void gtk_menu_insert(GtkMenu *menu, GtkWidget *child, gint… | |
void gtk_menu_append(GtkMenu *menu, GtkWidget *child); | |
void gtk_menu_prepend(GtkMenu *menu, GtkWidget *child); | |
GtkWidget *gtk_menu_item_new_with_label(const gchar *label); | |
-void gtk_menu_item_set_right_justified(GtkMenuItem *menu_item, | |
- gboolean right_justified); | |
#define gtk_menu_item_new_with_mnemonic gtk_menu_item_new_with_label | |
#define gtk_check_menu_item_new_with_mnemonic gtk_menu_item_new_with_label | |
GtkMenu *gtk_menu_item_get_submenu(GtkMenuItem *menu_item); | |
diff --git a/src/gtkport/itemfactory.c b/src/gtkport/itemfactory.c | |
t@@ -213,9 +213,6 @@ void dp_gtk_item_factory_create_item(DPGtkItemFactory *ifa… | |
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), TRUE); | |
} else { | |
menu_item = gtk_menu_item_new_with_mnemonic(menu_title->str); | |
- if (entry->item_type && strcmp(entry->item_type, "<LastBranch>") == 0) { | |
- gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_item), TRUE); | |
- } | |
} | |
new_child->widget = menu_item; | |
if (entry->callback) { | |
diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c | |
t@@ -179,7 +179,7 @@ static DPGtkItemFactoryEntry menu_items[] = { | |
* start of each game, below, so is not marked for gettext here */ | |
{"/Errands/S_ack Bitch...", NULL, SackBitch, 0, NULL}, | |
{N_("/Errands/_Get spy reports..."), NULL, GetSpyReports, 0, NULL}, | |
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"}, | |
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"}, | |
{N_("/Help/_About..."), "F1", display_intro, 0, NULL} | |
}; | |