Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove support for Win9x from wxMSW.

Browse Source 
Most importantly, this allows us to remove all MSLU-related stuff.

Some functions which were previously loaded dynamically can now be just used
directly, too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-16 02:33:40 +00:00
parent e3c2531b4c
commit 0d4ad161d5
1036 changed files with 12134 additions and 16801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
configure vendored
View File

@@ -1122,7 +1122,6 @@ enable_std_iostreams
enable_std_string
enable_std_string_conv_in_wxstring
enable_unicode
enable_mslu
enable_utf8
enable_utf8only
enable_extended_rtti
@@ -2052,7 +2051,6 @@ Optional Features:
--enable-std_string use standard C++ string classes
--enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString
--disable-unicode compile without Unicode support
--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-utf8 use UTF-8 representation for strings (Unix only)
--enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
--enable-extended_rtti use extended RTTI (XTI)
@@ -6119,50 +6117,6 @@ fi
$as_echo "$result" >&6; }
enablestring=
defaultval=
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
defaultval=yes
else
defaultval=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-mslu" >&5
$as_echo_n "checking for --${enablestring:-enable}-mslu... " >&6; }
# Check whether --enable-mslu was given.
if test "${enable_mslu+set}" = set; then :
enableval=$enable_mslu;
if test "$enableval" = yes; then
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
else
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
fi
else
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
fi
eval "$wx_cv_use_mslu"
if test x"$enablestring" = xdisable; then
if test $wxUSE_UNICODE_MSLU = no; then
result=yes
else
result=no
fi
else
result=$wxUSE_UNICODE_MSLU
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
enablestring=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-utf8" >&5
$as_echo_n "checking for --${enablestring:-enable}-utf8... " >&6; }
@@ -35370,58 +35324,6 @@ fi
if test "$wxUSE_UNICODE" = "yes" ; then
$as_echo "#define wxUSE_UNICODE 1" >>confdefs.h
if test "$USE_WIN32" != 1; then
wxUSE_UNICODE_MSLU=no
fi
if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5
$as_echo_n "checking for main in -lunicows... " >&6; }
if ${ac_cv_lib_unicows_main+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lunicows $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
return main ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_unicows_main=yes
else
ac_cv_lib_unicows_main=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unicows_main" >&5
$as_echo "$ac_cv_lib_unicows_main" >&6; }
if test "x$ac_cv_lib_unicows_main" = xyes; then :
$as_echo "#define wxUSE_UNICODE_MSLU 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
Applications will only run on Windows NT/2000/XP!" >&5
$as_echo "$as_me: WARNING: Compiler doesn't support MSLU (libunicows.a), disabled.
Applications will only run on Windows NT/2000/XP!" >&2;}
wxUSE_UNICODE_MSLU=no
fi
fi
fi
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "yes"; then
@@ -36393,10 +36295,6 @@ $as_echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&
fi
fi
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
LIBS=" -lunicows $LIBS"
fi
USE_RICHTEXT=0
if test "$wxUSE_RICHTEXT" = "yes"; then
$as_echo "#define wxUSE_RICHTEXT 1" >>confdefs.h