X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1446dfdbfebeda4033a2f0ecb46148b2fdb33e7b..338d1deba96d07da09269a12a3cdf4ffc29ab879:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 05cc3427cb..afaacc7b4c 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1151,10 +1151,11 @@ enum wxGeometryCentre
 
 enum wxOrientation
 {
+    // don't change the values of these elements, they are used elsewhere
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 
-    wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
+    wxBOTH                    = wxVERTICAL | wxHORIZONTAL
 };
 
 enum wxDirection
@@ -1443,24 +1444,6 @@ enum wxBorder
 #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
  */
@@ -2246,7 +2229,7 @@ enum wxUpdateUI
 #   define wxALL_FILES           gettext_noop("All files (*)|*")
 #endif
 
-#if defined(__CYGWIN__)
+#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