From fa9982d7106342e739c3fa66ac40d0d0a2b022ff Mon Sep 17 00:00:00 2001
From: Ryan Norton <wxprojects@comcast.net>
Date: Thu, 18 Dec 2003 03:34:22 +0000
Subject: [PATCH] 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
---
 include/wx/defs.h   | 24 ++++++++++++++----------
 include/wx/wxchar.h |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 871a569ed3..d2bca34863 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -24,19 +24,23 @@
 
 #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 */
-#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
-    #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
@@ -2016,7 +2020,7 @@ typedef void*       WXDisplay;
 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; */
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 0a8f8ea204..58e6c84fca 100644
--- 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)
 
-            /*  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 */
-- 
2.45.2