X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43a6124f651fe08a8f8a9529e5d495017ebd62b7..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/wxprec.h

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 5e34e7089c..1d3844dd9c 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -22,7 +22,9 @@
       defined(__VISAGECPP__) || \
       defined(__MWERKS__)
 
-    #if !defined(NOPCH)
+    // If user did not request NOCPH and we're not building using configure
+    // then assume user wants precompiled headers.
+    #if !defined(NOPCH) && !defined(__WX_SETUP_H__)
         #define WX_PRECOMP
     #endif
 #endif
@@ -43,6 +45,11 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
+// include all PalmOS headers at once
+#ifdef __WXPALMOS__
+#   include <PalmOS.h>
+#endif
+
 // include the most common wx headers
 #include "wx/wx.h"