diff options
author | Anders Broman <anders.broman@ericsson.com> | 2011-08-22 07:46:10 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2011-08-22 07:46:10 +0000 |
commit | 6d409485ac2703e65601a05c234c5311e47465d1 (patch) | |
tree | 6df0c87e730a85c9df9470ecce1ef6b228c5e168 | |
parent | 2450d57b3864fa7420ab2ddbacf1c83e11e29893 (diff) |
Remove register_stat_menu_item() if MAIN_MENU_USE_UIMANAGER 1
svn path=/trunk/; revision=38658
-rw-r--r-- | gtk/gui_stat_menu.h | 8 | ||||
-rw-r--r-- | gtk/main_menubar.c | 54 |
2 files changed, 0 insertions, 62 deletions
diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h index 88dc4a0412..56fa00874c 100644 --- a/gtk/gui_stat_menu.h +++ b/gtk/gui_stat_menu.h @@ -62,14 +62,6 @@ extern "C" { * @param callback_data data for callback function */ #ifdef MAIN_MENU_USE_UIMANAGER -void -register_stat_menu_item( - const char *name _U_, - register_stat_group_t group _U_, - gpointer callback _U_, - gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data) _U_, - gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data) _U_, - gpointer callback_data _U_); #else void register_stat_menu_item( diff --git a/gtk/main_menubar.c b/gtk/main_menubar.c index ae1d2ad880..bde01b9f9e 100644 --- a/gtk/main_menubar.c +++ b/gtk/main_menubar.c @@ -3624,60 +3624,6 @@ register_stat_menu_item_stock( callback_data, curnode); } -/* - * Add a new menu item for a stat. - * This must be called after we've created the main menu, so it can't - * be called from the routine that registers stats - we have to introduce - * another per-stat registration routine. - * - * @param name the menu label - * - * @param group the menu group this stat should be registered to - * - * @param callback gets called when the menu item is selected; it should do - * the work of creating the stat window. - * - * @param selected_packet_enabled gets called by set_menus_for_selected_packet(); - * it's passed a pointer to the "frame_data" structure for the current frame, - * if any, and to the "epan_dissect_t" structure for that frame, if any, and - * should return TRUE if the stat will work now (which might depend on whether - * a frame is selected and, if one is, on the frame) and FALSE if not. - * - * @param selected_tree_row_enabled gets called by - * set_menus_for_selected_tree_row(); it's passed a pointer to the - * "field_info" structure for the currently selected field, if any, - * and should return TRUE if the stat will work now (which might depend on - * whether a tree row is selected and, if one is, on the tree row) and - * FALSE if not. - * - * @param callback_data data for callback function - */ -void -register_stat_menu_item( - const char *name _U_, - register_stat_group_t group _U_, - gpointer callback _U_, - gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data) _U_, - gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data) _U_, - gpointer callback_data _U_) -{ - -#if 0 -register_stat_menu_item_stock( - group, - NULL, /* gui_path */ - name, /* name */ - NULL, /* stock_id */ - name, /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(callback), - FALSE, - selected_packet_enabled, - selected_tree_row_enabled, - callback_data); -#endif -} #if 0 static void |