X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75ac34cefc896f5fe466661e233bf6a6f0df8e84..125e7c11c16f23daa4c594f3b8d90194099c2394:/include/wx/private/wxprintf.h?ds=sidebyside

diff --git a/include/wx/private/wxprintf.h b/include/wx/private/wxprintf.h
index 8cfdb2ac1b..67f05f6f57 100644
--- a/include/wx/private/wxprintf.h
+++ b/include/wx/private/wxprintf.h
@@ -514,7 +514,7 @@ void wxPrintfConvSpec<CharType>::ReplaceAsteriskWith(int width)
 
     // find the first * in our flag buffer
     char *pwidth = strchr(m_szFlags, '*');
-    wxCHECK_RET(pwidth, _T("field width must be specified"));
+    wxCHECK_RET(pwidth, wxT("field width must be specified"));
 
     // save what follows the * (the +1 is to skip the asterisk itself!)
     strcpy(temp, pwidth+1);
@@ -685,13 +685,13 @@ int wxPrintfConvSpec<CharType>::Process(CharType *buf, size_t lenMax, wxPrintfAr
 
                 if (!m_bAlignLeft)
                     for (i = 1; i < (size_t)m_nMinWidth; i++)
-                        APPEND_CH(_T(' '));
+                        APPEND_CH(wxT(' '));
 
                 APPEND_CH(val);
 
                 if (m_bAlignLeft)
                     for (i = 1; i < (size_t)m_nMinWidth; i++)
-                        APPEND_CH(_T(' '));
+                        APPEND_CH(wxT(' '));
             }
             break;
 
@@ -716,7 +716,7 @@ int wxPrintfConvSpec<CharType>::Process(CharType *buf, size_t lenMax, wxPrintfAr
                 if (!m_bAlignLeft)
                 {
                     for (i = len; i < m_nMinWidth; i++)
-                        APPEND_CH(_T(' '));
+                        APPEND_CH(wxT(' '));
                 }
 
                 len = wxMin((unsigned int)len, lenMax-lenCur);
@@ -726,7 +726,7 @@ int wxPrintfConvSpec<CharType>::Process(CharType *buf, size_t lenMax, wxPrintfAr
                 if (m_bAlignLeft)
                 {
                     for (i = len; i < m_nMinWidth; i++)
-                        APPEND_CH(_T(' '));
+                        APPEND_CH(wxT(' '));
                 }
             }
             break;
@@ -795,9 +795,11 @@ struct wxPrintfConvSpecParser
     typedef wxPrintfConvSpec<CharType> ConvSpec;
 
     wxPrintfConvSpecParser(const CharType *fmt)
-        : posarg_present(false), nonposarg_present(false),
-          nargs(0)
     {
+        nargs = 0;
+        posarg_present =
+        nonposarg_present = false;
+
         memset(pspec, 0, sizeof(pspec));
 
         // parse the format string