X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c02a70d4f3840967fcb5b81bcec66c040f60616..3c203a185145a1aa720faf53e7f6fbebb35bce7a:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0c9d550056..6a9e046661 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -5,7 +5,7 @@
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     01/02/97
 *  RCS-ID:      $Id$
-*  Copyright:   (c)
+*  Copyright:   (c) Julian Smart
 *  Licence:     wxWindows licence
 */
 
@@ -170,6 +170,7 @@
     #endif /*  compilers */
 #endif /*  HAVE_BOOL */
 
+#if !defined(__MWERKS__) || !defined(true)
 #if !defined(HAVE_BOOL) && !defined(bool) && !defined(VMS)
     /*  NB: of course, this doesn't replace the standard type, because, for */
     /*      example, overloading based on bool/int parameter doesn't work and */
@@ -185,6 +186,7 @@
     #define true ((bool)1)
     #define false ((bool)0)
 #endif
+#endif
 
 /*  for backwards compatibility, also define TRUE and FALSE */
 /*  */
@@ -613,7 +615,8 @@ enum
     wxWINDOWS_OS2,            /*  Native OS/2 PM */
     wxUNIX,                   /*  wxBase under Unix */
     wxX11,                    /*  Plain X11 and Universal widgets */
-    wxPALMOS                  /*  PalmOS */
+    wxPALMOS,                 /*  PalmOS */
+    wxDOS                     /*  wxBase under MS-DOS */
 };
 
 /*  ---------------------------------------------------------------------------- */
@@ -1151,10 +1154,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 +1447,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
  */
@@ -2248,9 +2234,12 @@ enum wxUpdateUI
 
 #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).  
+         /*
+            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