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

wxOS2 with Open Watcom: correct PCH usage, missing headers, warning fixes, source cleaning and other Watcom adjustements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-07-21 17:08:28 +00:00
parent 6670f56440
commit 0872eaf957
7 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/chkconf.h
View File

@ -1513,7 +1513,7 @@
# if !wxUSE_DOC_VIEW_ARCHITECTURE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
# error "wxUSE_MDI_ARCHITECTURE requires wxUSE_DOC_VIEW_ARCHITECTURE"
# else
# undef wxUSE_DOC_VIEW_ARCHITECTURE
# define wxUSE_DOC_VIEW_ARCHITECTURE 1
@ -1524,7 +1524,7 @@
#if !wxUSE_FILEDLG
# if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxFileDialog must be compiled as well"
# error "wxUSE_FILEDLG is required by wxUSE_DOC_VIEW_ARCHITECTURE and wxUSE_WXHTML_HELP!"
# else
# undef wxUSE_FILEDLG
# define wxUSE_FILEDLG 1
@ -1684,4 +1684,3 @@
#endif /* wxUSE_SOCKETS */
#endif /* wxUSE_GUI */

3
include/wx/debug.h
View File

@ -198,7 +198,7 @@
It may be used both within a function and in the global scope.
*/
#ifdef __WATCOMC__
#if defined(__WATCOMC__) && defined(__cplusplus)
/* avoid "unused symbol" warning */
#define wxCOMPILE_TIME_ASSERT(expr, msg) \
class wxMAKE_UNIQUE_ASSERT_NAME { \
@ -249,4 +249,3 @@
#endif /* __cplusplus */
#endif /* _WX_DEBUG_H_ */

2
include/wx/defs.h
View File

@ -902,7 +902,7 @@ inline void *wxUIntToPtr(wxUIntPtr p)
#define wxLongLong_t __int64
#define wxLongLongSuffix i64
#define wxLongLongFmtSpec _T("L")
#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__) || defined(__OS2__)))
#define wxLongLong_t __int64
#define wxLongLongSuffix i64
#define wxLongLongFmtSpec _T("L")

4
include/wx/dynlib.h
View File

@ -23,10 +23,8 @@
#include "wx/string.h"
#include "wx/dynarray.h"
// FIXME: can this go in private.h or something too??
#if defined(__WXPM__) || defined(__EMX__)
#define INCL_DOS
#include <os2.h>
#include "wx/os2/private.h"
#endif
#ifdef __WXMSW__

3
include/wx/filefn.h
View File

@ -49,6 +49,9 @@
// __OS2__ and __UNIX__ are defined.
#include <process.h>
#include "wx/os2/private.h"
#ifdef __WATCOMC__
#include <direct.h>
#endif
#include <io.h>
#ifdef __EMX__
#include <unistd.h>

2
include/wx/platform.h
View File

@ -494,6 +494,7 @@
( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
!defined(__DOS__) && \
!defined(__WXOS2__) && \
!defined(__WXMOTIF__) && \
!defined(__WXGTK__) && \
!defined(__WXX11__) && \
@ -560,4 +561,3 @@
#endif
#endif /* _WX_PLATFORM_H_ */

13
include/wx/popupwin.h
View File

@ -56,17 +56,17 @@ public:
// include the real class declaration
#ifdef __WXMSW__
#if defined(__WXMSW__)
#include "wx/msw/popupwin.h"
#elif __WXPM__
#elif defined(__WXPM__)
#include "wx/os2/popupwin.h"
#elif __WXGTK__
#elif defined(__WXGTK__)
#include "wx/gtk/popupwin.h"
#elif __WXX11__
#elif defined(__WXX11__)
#include "wx/x11/popupwin.h"
#elif __WXMOTIF__
#elif defined(__WXMOTIF__)
#include "wx/motif/popupwin.h"
#elif __WXMGL__
#elif defined(__WXMGL__)
#include "wx/mgl/popupwin.h"
#else
#error "wxPopupWindow is not supported under this platform."
@ -190,4 +190,3 @@ protected:
#endif // wxUSE_POPUPWIN
#endif // _WX_POPUPWIN_H_BASE_