diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | CMakeOptions.txt | 3 | ||||
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.h.win32 | 1 | ||||
| -rw-r--r-- | config.nmake | 3 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | gtk/CMakeLists.txt | 6 |
7 files changed, 1 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f1bf637a6..85cb6ca7b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,6 @@ endif() if(BUILD_wireshark) if(ENABLE_GTK3) set(PACKAGELIST ${PACKAGELIST} GTK3) - set(ENABLE_UI_MANAGER ON) else() set(PACKAGELIST ${PACKAGELIST} GTK2) set(GTK2_OPTIONS COMPONENTS gtk) @@ -430,9 +429,6 @@ add_subdirectory( wsutil ) if(BUILD_wireshark AND GTK_FOUND) add_subdirectory( gtk ) - if (ENABLE_UI_MANAGER) - set(MAIN_MENU_USE_UIMANAGER 1) - endif() endif() # Basedir where to install guides diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 52a1efa122..ea43c4ab4f 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -17,8 +17,7 @@ option(AUTOGEN_pidl "Autogenerate pidl dissectors" OFF) option(DISABLE_WERROR "Do not treat Warnings as errors" OFF) option(ENABLE_EXTRA_GCC_CHECKS "Do additional -W checks in GCC (disables -Werror)" OFF) -option(ENABLE_GTK3 "Use GTK3 instead of GTK2 (does not compile yet)" OFF) -option(ENABLE_UI_MANAGER "Build GTK UI with the new UI-Manager API" ON) +option(ENABLE_GTK3 "Use GTK3 instead of GTK2" OFF) option(ENABLE_PCAP "Enable libpcap support (required for capturing)" ON) # # Do not make this the default on UN*X; AirPcap support is available diff --git a/Makefile.nmake b/Makefile.nmake index de879764c2..3e52114e08 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -385,7 +385,6 @@ config.h : config.h.win32 config.nmake -e "s/@INET6@/$(INET6_CONFIG)/" \ -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \ -e "s/@PCAP_NG_DEFAULT@/$(PCAP_NG_DEFAULT)/" \ - -e "s/@MAIN_MENU_USE_UIMANAGER@/$(MAIN_MENU_USE_UIMANAGER)/" \ -e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \ < config.h.win32 > $@ diff --git a/config.h.win32 b/config.h.win32 index 3d2eb3d34c..41cd54c593 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -77,7 +77,6 @@ @HAVE_AIRPCAP@ @PCAP_NG_DEFAULT@ -@MAIN_MENU_USE_UIMANAGER@ @WANT_PACKET_EDITOR@ /* define macro for importing variables from an dll diff --git a/config.nmake b/config.nmake index df06043f46..d56294615d 100644 --- a/config.nmake +++ b/config.nmake @@ -216,9 +216,6 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 ### Warning Experimental - work in progress #WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 -##### To use UIManager insted of GtkItemFactory comment out this line NOTE not completly implemented yet some menus will be missing#### -MAIN_MENU_USE_UIMANAGER=^#define MAIN_MENU_USE_UIMANAGER 1 - !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" ##### Win32 Libraries ##### # diff --git a/configure.in b/configure.in index 7a81a4d677..5873294e4c 100644 --- a/configure.in +++ b/configure.in @@ -820,14 +820,6 @@ else GTK_OK=no fi -AC_ARG_ENABLE(ui-manager, - AC_HELP_STRING( [--enable-ui-manager], - [use ui-manager in Wireshark (experimental) @<:@default=yes@:>@]), - enable_uimanager=$enableval,enable_uimanager=yes) -if test x$enable_uimanager = xyes -o x$with_gtk3 = xyes; then - AC_DEFINE(MAIN_MENU_USE_UIMANAGER, 1, [Use GTK ui-manager]) -fi - # GLib checks; we require GLib 2.14 or later, and require gmodule # support, as we need that for dynamically loading plugins. # If we found GTK+, this doesn't add GLIB_CFLAGS to CFLAGS, because diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index 67cd67bc63..25b4f783b5 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -249,12 +249,6 @@ endif() # add_definitions(-DNEW_MENU_CODE) -if (ENABLE_UI_MANAGER) - add_definitions( - -DMAIN_MENU_USE_UIMANAGER - ) -endif() - if(WIN32) set(PLATFORM_UI_SRC capture_if_details_dlg_win32.c |