Set initial window size as its minimal size.

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

diff --git a/include/wx/chartype.h b/include/wx/chartype.h
index 64f7147cbbc744d1c0a1be43059fe0518e32aaf0..480d1b1e2d003f7dc45b903f02085d0b7520014f 100644 (file)
--- a/include/wx/chartype.h
+++ b/include/wx/chartype.h
@@ -1,7 +1,7 @@
 /*
  * Name:        wx/chartype.h
  * Purpose:     Declarations of wxChar and related types
 /*
  * Name:        wx/chartype.h
  * Purpose:     Declarations of wxChar and related types

- * Author:      Joel Farley, Ove Kåven
+ * Author:      Joel Farley, Ove Kåven

  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$
  * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
  * Created:     1998/06/12
  * RCS-ID:      $Id$


@@ -38,8 +38,8 @@
 #endif /* !defined(wxUSE_WCHAR_T) */
 
 /* Unicode support requires wchar_t */
 #endif /* !defined(wxUSE_WCHAR_T) */
 
 /* Unicode support requires wchar_t */

-#if wxUSE_UNICODE && !wxUSE_WCHAR_T
-    #error "wchar_t must be available in Unicode build"
+#if !wxUSE_WCHAR_T
+    #error "wchar_t must be available"

 #endif /* Unicode */
 
 /*
 #endif /* Unicode */
 
 /*


@@ -145,7 +145,7 @@
     typedef char wxChar;
     typedef signed char wxSChar;
     typedef unsigned char wxUChar;
     typedef char wxChar;
     typedef signed char wxSChar;
     typedef unsigned char wxUChar;

-#else /* Unicode */
+#else

     /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as    */
     /*     signed/unsigned version of it which (a) makes sense to me (unlike */
     /*     char wchar_t is always unsigned) and (b) was how the previous     */
     /* VZ: note that VC++ defines _T[SU]CHAR simply as wchar_t and not as    */
     /*     signed/unsigned version of it which (a) makes sense to me (unlike */
     /*     char wchar_t is always unsigned) and (b) was how the previous     */


@@ -222,7 +222,7 @@
 
 
 /* ------------------------------------------------------------------------- */
 
 
 /* ------------------------------------------------------------------------- */

-/* define _T() and related macros                                            */
+/* define wxT() and related macros                                           */

 /* ------------------------------------------------------------------------- */
 
 /* BSD systems define _T() to be something different in ctype.h, override it */
 /* ------------------------------------------------------------------------- */
 
 /* BSD systems define _T() to be something different in ctype.h, override it */


@@ -231,15 +231,19 @@
     #undef _T
 #endif
 
     #undef _T
 #endif
 

-/* could already be defined by tchar.h (it's quasi standard) */
-#ifndef _T
+/*
+   wxT ("wx text") macro turns a literal string constant into a wide char
+   constant. It is mostly unnecessary with wx 2.9 but defined for
+   compatibility.
+ */
+#ifndef wxT

     #if !wxUSE_UNICODE
     #if !wxUSE_UNICODE

-        #define _T(x) x
+        #define wxT(x) x

     #else /* Unicode */
         /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */
     #else /* Unicode */
         /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */

-        #define _T(x) wxCONCAT_HELPER(L, x)
+        #define wxT(x) wxCONCAT_HELPER(L, x)

     #endif /* ASCII/Unicode */
     #endif /* ASCII/Unicode */

-#endif /* !defined(_T) */
+#endif /* !defined(wxT) */

 
 /*
    wxS ("wx string") macro can be used to create literals using the same
 
 /*
    wxS ("wx string") macro can be used to create literals using the same


@@ -253,13 +257,25 @@
     #define wxS(x) x
 #endif
 
     #define wxS(x) x
 #endif
 

-/* although global macros with such names are normally bad, we want to have  */
-/* another name for _T() which should be used to avoid confusion between     */
-/* _T() and _() in wxWidgets sources */
-#define wxT(x)       _T(x)
+/*
+    _T() is a synonym for wxT() familiar to Windows programmers. As this macro
+    has even higher risk of conflicting with system headers, its use is
+    discouraged and you may predefine wxNO__T to disable it. Additionally, we
+    do it ourselves for Sun CC which is known to use it in its standard headers
+    (see #10660).
+ */
+#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+    #ifndef wxNO__T
+        #define wxNO__T
+    #endif
+#endif
+
+#if !defined(_T) && !defined(wxNO__T)
+    #define _T(x) wxT(x)
+#endif

 
 /* a helper macro allowing to make another macro Unicode-friendly, see below */
 
 /* a helper macro allowing to make another macro Unicode-friendly, see below */

-#define wxAPPLY_T(x) _T(x)
+#define wxAPPLY_T(x) wxT(x)

 
 /* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
 #ifndef __TFILE__
 
 /* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
 #ifndef __TFILE__