diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-10-15 19:58:55 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-10-16 20:31:00 +0000 |
| commit | 356d6b8db04bfc15a1d0a5fabbc79aad0e81d592 (patch) | |
| tree | b346c363b55304db2fc5a81b0498c5e4027063d0 /ui/gtk/prefs_gui.c | |
| parent | 0a3cf5d5cf09c17afd06c64172780b4a02acdb62 (diff) | |
GTK: Remove OSX integration library support
Only Wireshark Qt is officially supported on macOS.
Change-Id: Id0e3429891173d4b91e99061bcf11df2e38bc0bf
Reviewed-on: https://code.wireshark.org/review/23931
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ui/gtk/prefs_gui.c')
| -rw-r--r-- | ui/gtk/prefs_gui.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 176f55dbfd..072d177fa1 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -58,10 +58,6 @@ static gint scroll_percent_changed_cb(GtkWidget *recent_df_entry _U_, #define GEOMETRY_SIZE_KEY "geometry_size" #define GEOMETRY_MAXIMIZED_KEY "geometry_maximized" -#if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION) -#define MACOSX_STYLE_KEY "macosx_style" -#endif - #ifdef _WIN32 #define GUI_CONSOLE_OPEN_KEY "console_open" #define ENABLE_UPDATE_KEY "enable_update" @@ -151,9 +147,6 @@ gui_prefs_show(void) GtkWidget *auto_scroll_cb, *scroll_percent_te; GtkWidget *webbrowser_te; GtkWidget *save_position_cb, *save_size_cb, *save_maximized_cb; -#if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION) - GtkWidget *macosx_style_cb; -#endif GtkWidget *expert_info_eyecandy_cb; GtkWidget *packet_editor_cb; @@ -203,16 +196,6 @@ gui_prefs_show(void) g_object_set_data(G_OBJECT(main_vb), ENABLE_UPDATE_KEY, enable_update_cb); #endif -#if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION) - macosx_style_cb = create_preference_check_button(main_grid, pos++, - "macOS style", - "Create a macOS look and feel. Checking this box will move the " - "menu bar to the top of the screen instead of the top of the Wireshark window. " - "Requires a restart of Wireshark to take effect.", - prefs.gui_macosx_style); - g_object_set_data(G_OBJECT(main_vb), MACOSX_STYLE_KEY, macosx_style_cb); -#endif - #ifdef _WIN32 /* How the console window should be opened */ console_open_om = create_preference_option_menu(main_grid, pos++, @@ -371,11 +354,6 @@ gui_prefs_fetch(GtkWidget *w) gtk_toggle_button_get_active((GtkToggleButton *)g_object_get_data(G_OBJECT(w), ENABLE_UPDATE_KEY)); #endif -#if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION) - prefs.gui_macosx_style = - gtk_toggle_button_get_active((GtkToggleButton *)g_object_get_data(G_OBJECT(w), MACOSX_STYLE_KEY)); -#endif - #ifdef _WIN32 prefs.gui_console_open = fetch_enum_value( g_object_get_data(G_OBJECT(w), GUI_CONSOLE_OPEN_KEY), gui_console_open_vals); |