AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disable sockets and MDI for Cocoa; do more consistency checks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-07-19 00:24:16 +00:00
parent fe5fc682a2
commit 3879ecda7c
2 changed files with 124 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
configure vendored
View File

@ -29746,13 +29746,6 @@ _ACEOF
fi
if test "$wxUSE_FS_INET" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FS_INET 1
_ACEOF
fi
if test "$wxUSE_FS_ZIP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FS_ZIP 1
@ -30512,6 +30505,11 @@ if test "$wxUSE_SOCKETS" = "yes"; then
echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
wxUSE_SOCKETS="no"
fi
if test "$wxUSE_COCOA" = "1"; then
{ echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}
wxUSE_SOCKETS="no"
fi
fi
if test "$wxUSE_SOCKETS" = "yes"; then
@ -30834,6 +30832,67 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
wxUSE_PROTOCOL=no
fi
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL 1
_ACEOF
if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_HTTP 1
_ACEOF
fi
if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_FTP 1
_ACEOF
fi
if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_FILE 1
_ACEOF
fi
else
if test "$wxUSE_FS_INET" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: HTTP filesystem require protocol classes... disabled" >&5
echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
wxUSE_FS_INET="no"
fi
fi
if test "$wxUSE_URL" = "yes"; then
if test "$wxUSE_PROTOCOL" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
wxUSE_URL=no
fi
if test "$wxUSE_URL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_URL 1
_ACEOF
fi
fi
if test "$wxUSE_FS_INET" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FS_INET 1
_ACEOF
fi
if test "$wxUSE_GUI" = "yes"; then
@ -31641,6 +31700,13 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_COCOA" = "1"; then
{ echo "$as_me:$LINENO: WARNING: MDI not yet supported under Cocoa... disabled" >&5
echo "$as_me: WARNING: MDI not yet supported under Cocoa... disabled" >&2;}
fi
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
@ -32478,54 +32544,6 @@ fi
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
wxUSE_PROTOCOL=no
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL 1
_ACEOF
if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_HTTP 1
_ACEOF
fi
if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_FTP 1
_ACEOF
fi
if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROTOCOL_FILE 1
_ACEOF
fi
fi
fi
if test "$wxUSE_URL" = "yes"; then
if test "$wxUSE_PROTOCOL" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
wxUSE_URL=no
fi
if test "$wxUSE_URL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_URL 1
_ACEOF
fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_MINIFRAME 1

87
configure.in
View File

@ -4111,10 +4111,6 @@ if test "$wxUSE_FILESYSTEM" = "yes"; then
AC_DEFINE(wxUSE_FILESYSTEM)
fi
if test "$wxUSE_FS_INET" = "yes"; then
AC_DEFINE(wxUSE_FS_INET)
fi
if test "$wxUSE_FS_ZIP" = "yes"; then
AC_DEFINE(wxUSE_FS_ZIP)
fi
@ -4349,12 +4345,16 @@ dnl ------------------------------------------------------------------------
dnl wxSocket
dnl ------------------------------------------------------------------------
dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxMGL
dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
if test "$wxUSE_SOCKETS" = "yes"; then
if test "$wxUSE_MGL" = "1"; then
AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
wxUSE_SOCKETS="no"
fi
if test "$wxUSE_COCOA" = "1"; then
AC_MSG_WARN([wxSocket not yet supported under Cocoa... disabled])
wxUSE_SOCKETS="no"
fi
fi
if test "$wxUSE_SOCKETS" = "yes"; then
@ -4449,6 +4449,46 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
AC_MSG_WARN(Protocol classes require sockets... disabled)
wxUSE_PROTOCOL=no
fi
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL)
if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_HTTP)
fi
if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_FTP)
fi
if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_FILE)
fi
else
if test "$wxUSE_FS_INET" = "yes"; then
AC_MSG_WARN([HTTP filesystem require protocol classes... disabled])
wxUSE_FS_INET="no"
fi
fi
if test "$wxUSE_URL" = "yes"; then
if test "$wxUSE_PROTOCOL" != "yes"; then
AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
wxUSE_URL=no
fi
if test "$wxUSE_URL" = "yes"; then
AC_DEFINE(wxUSE_URL)
fi
fi
if test "$wxUSE_FS_INET" = "yes"; then
AC_DEFINE(wxUSE_FS_INET)
fi
dnl ---------------------------------------------------------------------------
dnl Joystick support
dnl ---------------------------------------------------------------------------
@ -4612,6 +4652,12 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
if test "$wxUSE_COCOA" = "1"; then
AC_MSG_WARN([MDI not yet supported under Cocoa... disabled])
fi
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
dnl There is now experimental generic MDI support
@ -5087,37 +5133,6 @@ fi
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
AC_MSG_WARN(Protocol classes require sockets... disabled)
wxUSE_PROTOCOL=no
fi
if test "$wxUSE_PROTOCOL" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL)
if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_HTTP)
fi
if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_FTP)
fi
if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
AC_DEFINE(wxUSE_PROTOCOL_FILE)
fi
fi
fi
if test "$wxUSE_URL" = "yes"; then
if test "$wxUSE_PROTOCOL" != "yes"; then
AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
wxUSE_URL=no
fi
if test "$wxUSE_URL" = "yes"; then
AC_DEFINE(wxUSE_URL)
fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
AC_DEFINE(wxUSE_MINIFRAME)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"