Correction in comment in closing #endif.

[wxWidgets.git] / include / wx / defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index daa43a38a287aa2a2c407d78d9230409cf811c6b..afaacc7b4cad765fc396048824d75ed2017b22f4 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -20,8 +20,6 @@
 
 #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 */
 #   if defined(__WXMSW__) && defined(__X__)
 #ifdef __cplusplus
 /*  Make sure the environment is set correctly */
 #   if defined(__WXMSW__) && defined(__X__)


@@ -1153,10 +1151,11 @@ enum wxGeometryCentre
 
 enum wxOrientation
 {
 
 enum wxOrientation
 {

+    // don't change the values of these elements, they are used elsewhere

     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 

-    wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
+    wxBOTH                    = wxVERTICAL | wxHORIZONTAL

 };
 
 enum wxDirection
 };
 
 enum wxDirection


@@ -1232,6 +1231,13 @@ enum wxBorder
     wxBORDER_MASK   = 0x1f200000
 };
 
     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 */
 /*  ---------------------------------------------------------------------------- */
 /*  ---------------------------------------------------------------------------- */
 /*  Window style flags */
 /*  ---------------------------------------------------------------------------- */


@@ -1438,24 +1444,6 @@ enum wxBorder
 #define wxRB_SINGLE         0x0008
 #define wxRB_USE_CHECKBOX   0x0010 /* alternative native control (wxPalmOS) */
 
 #define wxRB_SINGLE         0x0008
 #define wxRB_USE_CHECKBOX   0x0010 /* alternative native control (wxPalmOS) */
 

-/*
- * wxSlider flags
- */
-#define wxSL_HORIZONTAL      wxHORIZONTAL /*  4 */
-#define wxSL_VERTICAL        wxVERTICAL   /*  8 */
-/*  The next one is obsolete - use scroll events instead */
-#define wxSL_NOTIFY_DRAG     0x0000
-#define wxSL_TICKS           0x0010
-#define wxSL_AUTOTICKS       wxSL_TICKS /*  we don't support manual ticks */
-#define wxSL_LABELS          0x0020
-#define wxSL_LEFT            0x0040
-#define wxSL_TOP             0x0080
-#define wxSL_RIGHT           0x0100
-#define wxSL_BOTTOM          0x0200
-#define wxSL_BOTH            0x0400
-#define wxSL_SELRANGE        0x0800
-#define wxSL_INVERSE         0x1000
-

 /*
  * wxScrollBar flags
  */
 /*
  * wxScrollBar flags
  */


@@ -2048,7 +2036,7 @@ enum wxKeyCode
     WXK_WINDOWS_MENU ,
     WXK_COMMAND,
 
     WXK_WINDOWS_MENU ,
     WXK_COMMAND,
 

-    // Hardware-specific buttons
+    /* Hardware-specific buttons */

     WXK_SPECIAL1 = 193,
     WXK_SPECIAL2,
     WXK_SPECIAL3,
     WXK_SPECIAL1 = 193,
     WXK_SPECIAL2,
     WXK_SPECIAL3,


@@ -2241,6 +2229,17 @@ enum wxUpdateUI
 #   define wxALL_FILES           gettext_noop("All files (*)|*")
 #endif
 
 #   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 */
 /*  --------------------------------------------------------------------------- */
 /*  macros that enable wxWidgets apps to be compiled in absence of the */
 /*  sytem headers, although some platform specific types are used in the */


@@ -2254,8 +2253,6 @@ enum wxUpdateUI
 typedef unsigned char WXCOLORREF[6];
 typedef void*       WXCGIMAGEREF;
 typedef void*       WXHBITMAP;
 typedef unsigned char WXCOLORREF[6];
 typedef void*       WXCGIMAGEREF;
 typedef void*       WXHBITMAP;

-//typedef void*       WXHMETAFILE;
-//typedef void*       WXHICON;

 typedef void*       WXHCURSOR;
 typedef void*       WXHRGN;
 typedef void*       WXRECTPTR;
 typedef void*       WXHCURSOR;
 typedef void*       WXHRGN;
 typedef void*       WXRECTPTR;


@@ -2428,6 +2425,7 @@ typedef void *          WXHBRUSH;
 typedef void *          WXHPALETTE;
 typedef void *          WXHCURSOR;
 typedef void *          WXHRGN;
 typedef void *          WXHPALETTE;
 typedef void *          WXHCURSOR;
 typedef void *          WXHRGN;

+typedef void *          WXRECTPTR;

 typedef void *          WXHACCEL;
 typedef void WXFAR  *   WXHINSTANCE;
 typedef void *          WXHBITMAP;
 typedef void *          WXHACCEL;
 typedef void WXFAR  *   WXHINSTANCE;
 typedef void *          WXHBITMAP;