## FIXME: This is a blatant hack
if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
wxUSE_PRINTING_ARCHITECTURE=no
- wxUSE_HELP=no
wxUSE_CLIPBOARD=no
wxUSE_DRAG_AND_DROP=no
wxUSE_DATAOBJ=no
# Generic notebook requires tab dialog
DEFAULT_wxUSE_TABDIALOG=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
- DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_SCROLLBAR=no
- DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_CALCTRL=no
- DEFAULT_wxUSE_SPINBTN=no
- DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_DRAGIMAGE=no
- DEFAULT_wxUSE_PROGRESSDLG=no
fi
- echo "$as_me:$LINENO: checking if w32api has good enough MSIE support" >&5
-echo $ECHO_N "checking if w32api has good enough MSIE support... $ECHO_C" >&6
-if test "${wx_cv_w32api_win32_ie+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <w32api.h>
-int
-main ()
-{
-
- #define wxCHECK_W32API_VERSION( major, minor ) \
- ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
- && ( ( __W32API_MAJOR_VERSION > (major) ) \
- || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
-
- #if !wxCHECK_W32API_VERSION(1,1)
- #error You need w32api 1.1 or newer
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- wx_cv_w32api_win32_ie=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- wx_cv_w32api_win32_ie=no
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $wx_cv_w32api_win32_ie" >&5
-echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
- if test "$wx_cv_w32api_win32_ie" = "yes" ; then
- CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
- fi
-
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
])
- dnl check if can use _WIN32_IE macro
- AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie,
- [
- AC_TRY_COMPILE([#include <w32api.h>],
- [
- #define wxCHECK_W32API_VERSION( major, minor ) \
- ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
- && ( ( __W32API_MAJOR_VERSION > (major) ) \
- || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
-
- #if !wxCHECK_W32API_VERSION(1,1)
- #error You need w32api 1.1 or newer
- #endif
- ], [
- wx_cv_w32api_win32_ie=yes
- ], [
- wx_cv_w32api_win32_ie=no
- ])
- ])
- if test "$wx_cv_w32api_win32_ie" = "yes" ; then
- CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
- fi
-
dnl --- FIXME: This is still a somewhat random list of libs,
dnl --- some of them should probably be included conditionally.
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
#ifndef _WX_PRIVATE_H_
#define _WX_PRIVATE_H_
-#ifndef STRICT
- #define STRICT 1
-#endif
-
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#if defined (__WXWINCE__)
#include "wx/msw/microwin.h"
#endif
-// undefine conflicting symbols which were defined in windows.h
-#include "wx/msw/winundef.h"
-
// Include fixes for MSLU:
#include "wx/msw/mslu.h"
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wrapwin.h
+// Purpose: Wrapper around <windows.h>, to be included instead of it
+// Created: 2003/07/22
+// RCS-ID: $Id$
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WRAPWIN_H_
+#define _WX_WRAPWIN_H_
+
+#include "wx/platform.h"
+
+#ifndef STRICT
+ #define STRICT 1
+#endif
+
+// define _WIN32_IE to a high value because we always check for the version
+// of installed DLLs at runtime anyway:
+#ifndef _WIN32_IE
+ // for compilers that use w32api headers: w32api must be >= 1.1:
+ #if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+ defined( __CYGWIN__ ) || \
+ (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || \
+ defined(__DIGITALMARS__)
+ #if wxCHECK_W32API_VERSION(1,1)
+ #define _WIN32_IE 0x400
+ #endif
+ #else
+ #define _WIN32_IE 0x400
+ #endif
+#endif
+
+#include <windows.h>
+#include "wx/msw/winundef.h"
+
+#endif
#define STRICT 1
#endif
- #include <windows.h>
- #include "wx/msw/winundef.h"
+ #include "wx/msw/wrapwin.h"
#endif
// include the most common wx headers
#include <unistd.h>
#include <sys/stat.h>
#ifdef __GNUWIN32__
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif
#elif defined(__DOS__)
#if defined(__WATCOMC__)
#endif
#ifdef __WINDOWS__
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#include "wx/msw/mslu.h"
// for _getcwd
// For GetShort/LongPathName
#ifdef __WIN32__
-#include <windows.h>
-#include "wx/msw/winundef.h"
+#include "wx/msw/wrapwin.h"
#endif
#ifdef __WXWINCE__
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#endif
#ifdef __WXMOTIF__
#endif
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#endif
//-----------------------------------------------------------------------------
// defining HAVE_BOOLEAN.
#if defined(__WXMSW__) && (defined(__MWERKS__) || defined(__DIGITALMARS__) || (defined(__WATCOMC__) && __WATCOMC__ < 1200))
#define HAVE_BOOLEAN
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif
extern "C"
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#ifdef GetClassInfo
#undef GetClassInfo
#include <string.h>
#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#include <commdlg.h>
#ifndef __WIN32__
#include "wx/quantize.h"
#ifdef __WXMSW__
-#include <windows.h>
#include "wx/msw/private.h"
#endif
// ----------------------------------------------------------------------------
#if defined(__WIN32__)
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif
#if defined(__WIN32__) && !defined(HAVE_FTIME) && !defined(__MWERKS__) && !defined(__WXWINCE__)
#include "wx/ownerdrw.h"
#include "wx/checklst.h"
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#include <windowsx.h>
#include "wx/msw/private.h"
#include "wx/clipbrd.h"
#include <string.h>
-#include <windows.h>
#include "wx/msw/private.h"
#if wxUSE_COLOURDLG
-#include <windows.h>
-
#include "wx/msw/private.h"
#include "wx/colordlg.h"
#include "wx/cmndata.h"
#include "wx/msw/private.h"
#include <string.h>
-#include <windows.h>
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
#include "wx/msw/crashrpt.h"
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#include <imagehlp.h>
#include "wx/msw/private.h"
#include "wx/msw/private.h"
#include <string.h>
-#include <windows.h>
#include <ddeml.h>
#ifdef __GNUWIN32_OLD__
// _WINDOWS_ is defined when windows.h is included,
// __WXMSW__ is defined for MS Windows compilation
#if defined(__WXMSW__) && !defined(_WINDOWS_)
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif //windows.h
// ----------------------------------------------------------------------------
#include "wx/log.h"
#include "wx/access.h"
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
// for some compilers, the entire ole2.h must be included, not only oleauto.h
#if wxUSE_NORLANDER_HEADERS || defined(__WATCOMC__)
#include <oleacc.h>
#include <winable.h>
-#include "wx/msw/winundef.h"
#include "wx/msw/ole/oleutils.h"
#ifndef CHILDID_SELF
#ifdef __WIN32__
#if !defined(__GNUWIN32__) || wxUSE_NORLANDER_HEADERS
#if wxCHECK_W32API_VERSION( 1, 0 )
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif
#include <shlobj.h> // for DROPFILES structure
#endif
// standard headers
#if wxCHECK_W32API_VERSION( 1, 0 )
- #include <windows.h>
+ #include "wx/msw/wrapwin.h"
#endif
#include <rpc.h> // UUID related functions
#define WIN32_LEAN_AND_MEAN
*/
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#ifdef __WXWINCE__
#include "wx/msw/private.h"
#if wxUSE_UXTHEME
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
-#include "wx/msw/winundef.h"
#include "wx/msw/uxtheme.h"
#include "wx/msw/private.h"
#include "wx/app.h" // for GetComCtl32Version
#include "wx/msw/wave.h"
#include "wx/msw/private.h"
-#include <windows.h>
#include <windowsx.h>
#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
*/
-#include <windows.h>
+#include "wx/msw/wrapwin.h"
#include <tchar.h>
#include <winsock.h>
#include <string.h>
#endif
#ifndef WX_PRECOMP
- #include <windows.h>
- #include "wx/msw/winundef.h"
+ #include "wx/msw/wrapwin.h"
#endif
#include "wx/msw/wince/time.h"
#endif
#ifndef WX_PRECOMP
- #include <windows.h>
- #include "wx/msw/winundef.h"
+ #include "wx/msw/wrapwin.h"
#include "wx/window.h"
#include "wx/accel.h"
#include "wx/setup.h"