tRemove deprecated types - vaccinewars - be a doctor and try to vaccinate the world (HTM) git clone git://src.adamsgaard.dk/vaccinewars (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 4e209bc4f3ffd11e78ebb3795818f41bcb431477 (DIR) parent 3300611f43cf08cdee8ff35240631c072f39674b (HTM) Author: Ben Webb <ben@salilab.org> Date: Sat, 21 Nov 2020 23:44:46 -0800 Remove deprecated types Diffstat: M src/gtkport/itemfactory.c | 8 ++++++++ M src/gtkport/itemfactory.h | 10 ++++++---- M src/gui_client/gtk_client.c | 3 +-- 3 files changed, 15 insertions(+), 6 deletions(-) --- (DIR) diff --git a/src/gtkport/itemfactory.c b/src/gtkport/itemfactory.c t@@ -27,6 +27,14 @@ #include "gtkport.h" /* No need to reimplement functions if we have GTK+2 */ +#if GTK_MAJOR_VERSION == 2 +GtkItemFactory *dp_gtk_item_factory_new(const gchar *path, + GtkAccelGroup *accel_group) +{ + return gtk_item_factory_new(GTK_TYPE_MENU_BAR, path, accel_group); +} +#endif + #if defined(CYGWIN) || GTK_MAJOR_VERSION > 2 #ifdef CYGWIN (DIR) diff --git a/src/gtkport/itemfactory.h b/src/gtkport/itemfactory.h t@@ -40,7 +40,10 @@ #define DPGtkItemFactoryCallback GtkItemFactoryCallback #define DPGtkItemFactoryEntry GtkItemFactoryEntry #define DPGtkItemFactory GtkItemFactory -#define dp_gtk_item_factory_new gtk_item_factory_new + +GtkItemFactory *dp_gtk_item_factory_new(const gchar *path, + GtkAccelGroup *accel_group); + #define dp_gtk_item_factory_create_items gtk_item_factory_create_items #define dp_gtk_item_factory_create_item gtk_item_factory_create_item #define dp_gtk_item_factory_get_widget gtk_item_factory_get_widget t@@ -71,8 +74,7 @@ struct _DPGtkItemFactory { gpointer translate_data; }; -DPGtkItemFactory *dp_gtk_item_factory_new(GtkType container_type, - const gchar *path, +DPGtkItemFactory *dp_gtk_item_factory_new(const gchar *path, GtkAccelGroup *accel_group); void dp_gtk_item_factory_create_item(DPGtkItemFactory *ifactory, DPGtkItemFactoryEntry *entry, t@@ -87,7 +89,7 @@ GtkWidget *dp_gtk_item_factory_get_widget(DPGtkItemFactory *ifactory, void dp_gtk_item_factory_set_translate_func(DPGtkItemFactory *ifactory, DPGtkTranslateFunc func, gpointer data, - GtkDestroyNotify notify); + GDestroyNotify notify); #endif /* GTK+2 */ #endif /* __ITEM_FACTORY_H__ */ (DIR) diff --git a/src/gui_client/gtk_client.c b/src/gui_client/gtk_client.c t@@ -2259,8 +2259,7 @@ gboolean GtkLoop(int *argc, char **argv[], accel_group = gtk_accel_group_new(); g_object_set_data(G_OBJECT(window), "accel_group", accel_group); - item_factory = ClientData.Menu = dp_gtk_item_factory_new(GTK_TYPE_MENU_BAR, - "<main>", + item_factory = ClientData.Menu = dp_gtk_item_factory_new("<main>", accel_group); dp_gtk_item_factory_set_translate_func(item_factory, MenuTranslate, NULL, NULL);