diff --git a/configure b/configure index 5aa56db3c6..a3cab8af38 100755 --- a/configure +++ b/configure @@ -1137,7 +1137,6 @@ enable_macosx_arch enable_compat28 enable_compat30 enable_rpath -enable_objc_uniquifying enable_visibility enable_tls enable_repro_build @@ -2078,7 +2077,6 @@ Optional Features: --enable-compat28 enable wxWidgets 2.8 compatibility --disable-compat30 disable wxWidgets 3.0 compatibility --disable-rpath disable use of rpath for uninstalled builds - --enable-objc_uniquifying enable Objective-C class name uniquifying --disable-visibility disable use of ELF symbols visibility even if supported --disable-tls disable use of compiler TLS support --enable-repro-build enable reproducible build mode @@ -5996,36 +5994,6 @@ fi - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - # Check whether --enable-objc_uniquifying was given. -if test "${enable_objc_uniquifying+set}" = set; then : - enableval=$enable_objc_uniquifying; - if test "$enableval" = yes; then - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=yes' - else - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' - fi - -else - - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" - -fi - - - eval "$wx_cv_use_objc_uniquifying" - - - enablestring=disable defaultval= if test -z "$defaultval"; then @@ -32701,11 +32669,6 @@ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then fi -if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then - $as_echo "#define wxUSE_OBJC_UNIQUIFYING 1" >>confdefs.h - -fi - if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then $as_echo "#define wxUSE_CONSOLE_EVENTLOOP 1" >>confdefs.h diff --git a/configure.in b/configure.in index 723cfcdee3..408aa0a627 100644 --- a/configure.in +++ b/configure.in @@ -670,8 +670,6 @@ WX_ARG_DISABLE(compat30, [ --disable-compat30 disable wxWidgets 3.0 co WX_ARG_DISABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH) -WX_ARG_ENABLE(objc_uniquifying,[ --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING) - WX_ARG_DISABLE(visibility, [ --disable-visibility disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY) WX_ARG_DISABLE(tls, [ --disable-tls disable use of compiler TLS support], wxUSE_COMPILER_TLS) @@ -5801,10 +5799,6 @@ if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then AC_DEFINE(wxUSE_PRINTF_POS_PARAMS) fi -if test "$wxUSE_OBJC_UNIQUIFYING" = "yes"; then - AC_DEFINE(wxUSE_OBJC_UNIQUIFYING) -fi - dnl --------------------------------------------------------------------------- dnl console event loop stuff dnl --------------------------------------------------------------------------- diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index d414884997..259416c087 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -307,13 +307,6 @@ library: @endDefList -@section page_wxusedef_cocoa Cocoa Symbols - -@beginDefList -@itemdef{wxUSE_OBJC_UNIQUIFYING, Enable Objective-C class name uniquifying.} -@endDefList - - @section page_wxusedef_msw wxMSW Symbols @beginDefList diff --git a/setup.h.in b/setup.h.in index a4da53aa94..61f5bf7b1f 100644 --- a/setup.h.in +++ b/setup.h.in @@ -891,11 +891,6 @@ */ #define wxUSE_WEBKIT 0 -/* - * Objective-C class name uniquifying - */ -#define wxUSE_OBJC_UNIQUIFYING 0 - /* * The const keyword is being introduced more in wxWindows. * You can use this setting to maintain backward compatibility. diff --git a/setup.h_vms b/setup.h_vms index f327f42a5f..d1f7842057 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -980,11 +980,6 @@ typedef pid_t GPid; */ #define wxUSE_WEBKIT 1 -/* - * Objective-C class name uniquifying - */ -#define wxUSE_OBJC_UNIQUIFYING 0 - /* * The const keyword is being introduced more in wxWindows. * You can use this setting to maintain backward compatibility.