made wxStringInputStream::GetSize() public instead of protected

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index f385649ec354f2b8aa215ef95031daa2ced14b58..465edc94f611562ee4ee1447ae20db3551d82975 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -696,9 +696,9 @@ typedef wxUint16 wxWord;
         typedef int wxInt32;
         typedef unsigned int wxUint32;
 
         typedef int wxInt32;
         typedef unsigned int wxUint32;
 

-               #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
-                       #define SIZEOF_WCHAR_T 4
-               #endif
+        #if defined(__MACH__) && !defined(SIZEOF_WCHAR_T)
+            #define SIZEOF_WCHAR_T 4
+        #endif

         #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)
             /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
             /*  common case is 4 but there configure would have defined */
         #if wxUSE_WCHAR_T && !defined(SIZEOF_WCHAR_T)
             /*  also assume that sizeof(wchar_t) == 2 (under Unix the most */
             /*  common case is 4 but there configure would have defined */


@@ -817,6 +817,24 @@ typedef float wxFloat32;
     typedef double wxDouble;
 #endif
 
     typedef double wxDouble;
 #endif
 

+/*
+    Some (non standard) compilers typedef wchar_t as an existing type instead
+    of treating it as a real fundamental type, set wxWCHAR_T_IS_REAL_TYPE to 0
+    for them and to 1 for all the others.
+ */
+#if wxUSE_WCHAR_T
+    /*
+        VC++ typedefs wchar_t as unsigned short by default, that is unless
+        /Za or /Zc:wchar_t option is used in which case _WCHAR_T_DEFINED is
+        defined.
+     */
+#   if defined(__VISUALC__) && !defined(_NATIVE_WCHAR_T_DEFINED)
+#       define wxWCHAR_T_IS_REAL_TYPE 0
+#   else /* compiler having standard-conforming wchar_t */
+#       define wxWCHAR_T_IS_REAL_TYPE 1
+#   endif
+#endif /* wxUSE_WCHAR_T */
+

 /*  ---------------------------------------------------------------------------- */
 /*  byte ordering related definition and macros */
 /*  ---------------------------------------------------------------------------- */
 /*  ---------------------------------------------------------------------------- */
 /*  byte ordering related definition and macros */
 /*  ---------------------------------------------------------------------------- */


@@ -1039,7 +1057,7 @@ enum wxStretch
     wxTILE                    = 0xc000,
 
     // for compatibility only, default now, don't use explicitly any more
     wxTILE                    = 0xc000,
 
     // for compatibility only, default now, don't use explicitly any more

-#if WXWIN_COMPATIBILITY_2_4    
+#if WXWIN_COMPATIBILITY_2_4

     wxADJUST_MINSIZE          = 0x00100000
 #else
     wxADJUST_MINSIZE          = 0
     wxADJUST_MINSIZE          = 0x00100000
 #else
     wxADJUST_MINSIZE          = 0


@@ -1318,6 +1336,27 @@ enum wxBorder
 #define wxNB_RIGHT            0x0040
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100
 #define wxNB_RIGHT            0x0040
 #define wxNB_BOTTOM           0x0080
 #define wxNB_MULTILINE        0x0100

+#define wxNB_DEFAULT          wxNB_TOP
+
+/*
+ * wxListbook flags
+ */
+#define wxLB_DEFAULT          0x0
+#define wxLB_TOP              0x1
+#define wxLB_BOTTOM           0x2
+#define wxLB_LEFT             0x4
+#define wxLB_RIGHT            0x8
+#define wxLB_ALIGN_MASK       0xf
+
+/*
+ * wxChoicebook flags
+ */
+#define wxCHB_DEFAULT         0x0
+#define wxCHB_TOP             0x1
+#define wxCHB_BOTTOM          0x2
+#define wxCHB_LEFT            0x4
+#define wxCHB_RIGHT           0x8
+#define wxCHB_ALIGN_MASK      0xf

 
 /*
  * wxTabCtrl flags
 
 /*
  * wxTabCtrl flags