Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/string.h b/include/wx/string.h
index c5658d9fc471582145290d97d301c3d725c4d608..517abb1185e536c73d5b765365f39c9aca065a3b 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -288,7 +288,7 @@ public:
     wxCStrData operator-(ptrdiff_t n) const
     {
         wxASSERT_MSG( n <= (ptrdiff_t)m_offset,
     wxCStrData operator-(ptrdiff_t n) const
     {
         wxASSERT_MSG( n <= (ptrdiff_t)m_offset,

-                      _T("attempt to construct address before the beginning of the string") );
+                      wxT("attempt to construct address before the beginning of the string") );

         return wxCStrData(m_str, m_offset - n, m_owned);
     }
 
         return wxCStrData(m_str, m_offset - n, m_owned);
     }
 


@@ -408,6 +408,7 @@ protected:
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
     // "non dll-interface class 'wxStringPrintfMixin' used as base interface
     // for dll-interface class 'wxString'" -- this is OK in our case
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
     // "non dll-interface class 'wxStringPrintfMixin' used as base interface
     // for dll-interface class 'wxString'" -- this is OK in our case

+    #pragma warning (push)

     #pragma warning (disable:4275)
 #endif
 
     #pragma warning (disable:4275)
 #endif
 


@@ -1512,14 +1513,14 @@ public:
     // get last character
     wxUniChar Last() const
     {
     // get last character
     wxUniChar Last() const
     {

-      wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") );
+      wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );

       return *rbegin();
     }
 
     // get writable last character
     wxUniCharRef Last()
     {
       return *rbegin();
     }
 
     // get writable last character
     wxUniCharRef Last()
     {

-      wxASSERT_MSG( !empty(), _T("wxString: index out of bounds") );
+      wxASSERT_MSG( !empty(), wxT("wxString: index out of bounds") );

       return *rbegin();
     }
 
       return *rbegin();
     }
 


@@ -1962,7 +1963,7 @@ public:
   {
 #if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
     wxASSERT_MSG( s.IsValid(),
   {
 #if WXWIN_COMPATIBILITY_2_8 && !wxUSE_STL_BASED_WXSTRING && !wxUSE_UNICODE_UTF8
     wxASSERT_MSG( s.IsValid(),

-                  _T("did you forget to call UngetWriteBuf()?") );
+                  wxT("did you forget to call UngetWriteBuf()?") );

 #endif
 
     append(s);
 #endif
 
     append(s);


@@ -2056,36 +2057,34 @@ public:
   // stream-like functions
       // insert an int into string
   wxString& operator<<(int i)
   // stream-like functions
       // insert an int into string
   wxString& operator<<(int i)

-    { return (*this) << Format(_T("%d"), i); }
+    { return (*this) << Format(wxT("%d"), i); }

       // insert an unsigned int into string
   wxString& operator<<(unsigned int ui)
       // insert an unsigned int into string
   wxString& operator<<(unsigned int ui)

-    { return (*this) << Format(_T("%u"), ui); }
+    { return (*this) << Format(wxT("%u"), ui); }

       // insert a long into string
   wxString& operator<<(long l)
       // insert a long into string
   wxString& operator<<(long l)

-    { return (*this) << Format(_T("%ld"), l); }
+    { return (*this) << Format(wxT("%ld"), l); }

       // insert an unsigned long into string
   wxString& operator<<(unsigned long ul)
       // insert an unsigned long into string
   wxString& operator<<(unsigned long ul)

-    { return (*this) << Format(_T("%lu"), ul); }
+    { return (*this) << Format(wxT("%lu"), ul); }

 #if defined wxLongLong_t && !defined wxLongLongIsLong
       // insert a long long if they exist and aren't longs
   wxString& operator<<(wxLongLong_t ll)
     {
 #if defined wxLongLong_t && !defined wxLongLongIsLong
       // insert a long long if they exist and aren't longs
   wxString& operator<<(wxLongLong_t ll)
     {

-      const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("d");
-      return (*this) << Format(fmt, ll);
+      return (*this) << Format("%" wxLongLongFmtSpec "d", ll);

     }
       // insert an unsigned long long
   wxString& operator<<(wxULongLong_t ull)
     {
     }
       // insert an unsigned long long
   wxString& operator<<(wxULongLong_t ull)
     {

-      const wxChar *fmt = _T("%") wxLongLongFmtSpec _T("u");
-      return (*this) << Format(fmt , ull);
+      return (*this) << Format("%" wxLongLongFmtSpec "u" , ull);

     }
 #endif // wxLongLong_t && !wxLongLongIsLong
       // insert a float into string
   wxString& operator<<(float f)
     }
 #endif // wxLongLong_t && !wxLongLongIsLong
       // insert a float into string
   wxString& operator<<(float f)

-    { return (*this) << Format(_T("%f"), f); }
+    { return (*this) << Format(wxT("%f"), f); }

       // insert a double into string
   wxString& operator<<(double d)
       // insert a double into string
   wxString& operator<<(double d)

-    { return (*this) << Format(_T("%g"), d); }
+    { return (*this) << Format(wxT("%g"), d); }

 
   // string comparison
     // case-sensitive comparison (returns a value < 0, = 0 or > 0)
 
   // string comparison
     // case-sensitive comparison (returns a value < 0, = 0 or > 0)


@@ -2272,7 +2271,7 @@ public:
       // convert to a double
   bool ToCDouble(double *val) const;
 #endif
       // convert to a double
   bool ToCDouble(double *val) const;
 #endif

-  
+

 #ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // formatted input/output
     // as sprintf(), returns the number of characters written or < 0 on error
 #ifndef wxNEEDS_WXSTRING_PRINTF_MIXIN
   // formatted input/output
     // as sprintf(), returns the number of characters written or < 0 on error


@@ -2427,7 +2426,7 @@ public:
                CreateConstIterator(last).impl())
   {
       wxASSERT_MSG( first.m_str == last.m_str,
                CreateConstIterator(last).impl())
   {
       wxASSERT_MSG( first.m_str == last.m_str,

-                    _T("pointers must be into the same string") );
+                    wxT("pointers must be into the same string") );

   }
 #endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
 
   }
 #endif // WXWIN_COMPATIBILITY_STRING_PTR_AS_ITER
 


@@ -3576,7 +3575,7 @@ private:
 };
 
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN
 };
 
 #ifdef wxNEEDS_WXSTRING_PRINTF_MIXIN

-    #pragma warning (default:4275)
+    #pragma warning (pop)

 #endif
 
 // string iterator operators that satisfy STL Random Access Iterator
 #endif
 
 // string iterator operators that satisfy STL Random Access Iterator


@@ -4164,7 +4163,7 @@ inline const wxStringCharType *wxCStrData::AsInternal() const
 inline wxUniChar wxCStrData::operator*() const
 {
     if ( m_str->empty() )
 inline wxUniChar wxCStrData::operator*() const
 {
     if ( m_str->empty() )

-        return wxUniChar(_T('\0'));
+        return wxUniChar(wxT('\0'));

     else
         return (*m_str)[m_offset];
 }
     else
         return (*m_str)[m_offset];
 }