1.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 871a569ed3bc132fd2826256df1e80e406998ef0..d2bca34863f903d7e92121e5ac64af7efea1ef97 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -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__)
-    #error "Target can't be both X and Windows"
-#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
+#   if defined(__WXMSW__) && defined(__X__)
+#       error "Target can't be both X and Windows"
+#   elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \

       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \
       !defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \
       wxUSE_GUI
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__WXCOCOA__) && \
       !defined(__X__) && !defined(__WXMGL__) && !defined(__WXX11__) && \
       wxUSE_GUI

-    #ifdef __UNIX__
-        #error "No Target! You should use wx-config program for compilation flags!"
-    #else /*  !Unix */
-    #error "No Target! You should use supplied makefiles for compilation!"
-    #endif /*  Unix/!Unix */
-#endif
+#       ifdef __UNIX__
+#           error "No Target! You should use wx-config program for compilation flags!"
+#       else /*  !Unix */
+#           error "No Target! You should use supplied makefiles for compilation!"
+#       endif /*  Unix/!Unix */
+#   endif
+#endif /*__cplusplus*/

 
 #ifndef __WXWINDOWS__
     #define __WXWINDOWS__ 1
 
 #ifndef __WXWINDOWS__
     #define __WXWINDOWS__ 1


@@ -2016,7 +2020,7 @@ typedef void*       WXDisplay;
 typedef WindowPtr       WXHWND;
 typedef Handle          WXHANDLE;
 typedef CIconHandle     WXHICON;
 typedef WindowPtr       WXHWND;
 typedef Handle          WXHANDLE;
 typedef CIconHandle     WXHICON;

-/* typedef unsigned long   WXHFONT; */
+// typedef unsigned long   WXHFONT; */

 typedef MenuHandle      WXHMENU;
 /* typedef unsigned long   WXHPEN; */
 /* typedef unsigned long   WXHBRUSH; */
 typedef MenuHandle      WXHMENU;
 /* typedef unsigned long   WXHPEN; */
 /* typedef unsigned long   WXHBRUSH; */

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 0a8f8ea2040cf19c5107832adadb8290debb663c..58e6c84fca2b4d552ab6a390ee5613e58ff7b972 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -504,7 +504,7 @@
             #define wxPuts(ws) wxFputs(ws, stdout)
             #define wxPutchar(wch) wxPutc(wch, stdout)
 
             #define wxPuts(ws) wxFputs(ws, 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
             /*  glibc doesn't have wide char equivalents of the other stuff so */
             /*  use our own versions */
             #define wxNEED_PRINTF_CONVERSION
             /*  glibc doesn't have wide char equivalents of the other stuff so */
             /*  use our own versions */