X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f059e30a1de9f4416d39e7747a6cdd6e39c6c30..8704b36653dc76ed7b6743642fb2925ffc5789d7:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 39459d328e..0c9d550056 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -20,8 +20,6 @@
 
 #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__)
@@ -1232,6 +1230,13 @@ enum wxBorder
     wxBORDER_MASK   = 0x1f200000
 };
 
+/* This makes it easier to specify a 'normal' border for a control */
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+#define wxDEFAULT_CONTROL_BORDER    wxBORDER_SIMPLE
+#else
+#define wxDEFAULT_CONTROL_BORDER    wxBORDER_SUNKEN
+#endif
+
 /*  ---------------------------------------------------------------------------- */
 /*  Window style flags */
 /*  ---------------------------------------------------------------------------- */
@@ -2241,6 +2246,17 @@ enum wxUpdateUI
 #   define wxALL_FILES           gettext_noop("All files (*)|*")
 #endif
 
+#if defined(__CYGWIN__) && defined(__WXMSW__)
+#   if wxUSE_STL || defined(wxUSE_STD_STRING)
+         //NASTY HACK because the gethostname in sys/unistd.h which the gnu stl includes
+         //and wx builds with by default clash with each other (windows version
+         //2nd param is int, sys/unistd.h version is unsigned int).  
+#        define gethostname gethostnameHACK
+#        include <unistd.h>
+#        undef gethostname
+#   endif
+#endif
+
 /*  --------------------------------------------------------------------------- */
 /*  macros that enable wxWidgets apps to be compiled in absence of the */
 /*  sytem headers, although some platform specific types are used in the */