X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4db88d421b2725dfc71d063c80d9e61b0e1e9458..855f31ebe72bef834a32df2c274b41fb282ad265:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 6bf190c292..e9ffe12880 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -59,9 +59,6 @@
     #define __WXBASE__
 #endif
 
-/*  include the feature test macros */
-#include "wx/features.h"
-
 /*  suppress some Visual C++ warnings */
 #ifdef __VISUALC__
     /*  the only "real" warning here is 4244 but there are just too many of them */
@@ -670,9 +667,6 @@ enum {  wxDefaultCoord = -1 };
 /*  practice) */
 
 /*  8bit */
-#ifndef SIZEOF_CHAR
-    #define SIZEOF_CHAR 1
-#endif
 typedef signed char wxInt8;
 typedef unsigned char wxUint8;
 typedef wxUint8 wxByte;
@@ -1277,20 +1271,18 @@ enum wxAlignment
 
 enum wxStretch
 {
+    /* for compatibility only, default now, don't use explicitly any more */
+#if WXWIN_COMPATIBILITY_2_6
+    wxADJUST_MINSIZE          = 0,
+#endif
+
     wxSTRETCH_NOT             = 0x0000,
     wxSHRINK                  = 0x1000,
     wxGROW                    = 0x2000,
     wxEXPAND                  = wxGROW,
     wxSHAPED                  = 0x4000,
     wxFIXED_MINSIZE           = 0x8000,
-    wxTILE                    = 0xc000,
-
-    /* for compatibility only, default now, don't use explicitly any more */
-#if WXWIN_COMPATIBILITY_2_4
-    wxADJUST_MINSIZE          = 0x00100000
-#else
-    wxADJUST_MINSIZE          = 0
-#endif
+    wxTILE                    = 0xc000
 };
 
 /*  border flags: the values are chosen for backwards compatibility */
@@ -1893,12 +1885,6 @@ enum
     wxCAP_BUTT
 };
 
-#if WXWIN_COMPATIBILITY_2_4
-    #define IS_HATCH(s)    ((s)>=wxFIRST_HATCH && (s)<=wxLAST_HATCH)
-#else
-    /* use wxBrush::IsHatch() instead thought wxMotif still uses it in src/motif/dcclient.cpp */
-#endif
-
 /*  Logical ops */
 typedef enum
 {
@@ -2842,6 +2828,10 @@ typedef const void* WXWidget;
 #endif
   /*  __WXMSW__ */
 
+
+/*  include the feature test macros */
+#include "wx/features.h"
+
 /*  --------------------------------------------------------------------------- */
 /*  macro to define a class without copy ctor nor assignment operator */
 /*  --------------------------------------------------------------------------- */