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

1.

Browse Source 
Only checks platform #defines in C++ now

2.
A couple /* within /* warnings were fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-18 03:34:22 +00:00
parent 2fa9ab8174
commit fa9982d710
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/defs.h
View File

@@ -24,19 +24,23 @@
#include "wx/platform.h" #include "wx/platform.h"
/* RN - only double-check the environment when building in C++
Shouldn't configure pass the environment to all sub-libs too? */
#ifdef __cplusplus
/* Make sure the environment is set correctly */ /* Make sure the environment is set correctly */
#if defined(__WXMSW__) && defined(__X__) # if defined(__WXMSW__) && defined(__X__)
#error "Target can't be both X and Windows" # error "Target can't be both X and Windows"
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ # elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
!defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \ !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \
!defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \ !defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \
wxUSE_GUI wxUSE_GUI
#ifdef __UNIX__ # ifdef __UNIX__
#error "No Target! You should use wx-config program for compilation flags!" # error "No Target! You should use wx-config program for compilation flags!"
#else /* !Unix */ # else /* !Unix */
#error "No Target! You should use supplied makefiles for compilation!" # error "No Target! You should use supplied makefiles for compilation!"
#endif /* Unix/!Unix */ # endif /* Unix/!Unix */
#endif # endif
#endif /*__cplusplus*/
#ifndef __WXWINDOWS__ #ifndef __WXWINDOWS__
#define __WXWINDOWS__ 1 #define __WXWINDOWS__ 1
@@ -2016,7 +2020,7 @@ typedef void* WXDisplay;
typedef WindowPtr WXHWND; typedef WindowPtr WXHWND;
typedef Handle WXHANDLE; typedef Handle WXHANDLE;
typedef CIconHandle WXHICON; typedef CIconHandle WXHICON;
/* typedef unsigned long WXHFONT; */ // typedef unsigned long WXHFONT; */
typedef MenuHandle WXHMENU; typedef MenuHandle WXHMENU;
/* typedef unsigned long WXHPEN; */ /* typedef unsigned long WXHPEN; */
/* typedef unsigned long WXHBRUSH; */ /* typedef unsigned long WXHBRUSH; */

2
include/wx/wxchar.h
View File

@@ -504,7 +504,7 @@
#define wxPuts(ws) wxFputs(ws, stdout) #define wxPuts(ws) wxFputs(ws, stdout)
#define wxPutchar(wch) wxPutc(wch, stdout) #define wxPutchar(wch) wxPutc(wch, stdout)
/* we need %s to %ls conversion for printf and scanf etc */ // we need %s to %ls conversion for printf and scanf etc */
#define wxNEED_PRINTF_CONVERSION #define wxNEED_PRINTF_CONVERSION
/* glibc doesn't have wide char equivalents of the other stuff so */ /* glibc doesn't have wide char equivalents of the other stuff so */
/* use our own versions */ /* use our own versions */