wxDFB: fix rendering artefacts when scrolling wxScrolledWindow that contains other...

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index f79bd0cbb86b4e8cb52cc6187b88044d886ee01e..52fc61910b081158361790d7509d6452b0ad69bb 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -167,6 +167,10 @@ bool WXDLLEXPORT wxOKlibc()
 
 #if !defined(wxVsnprintf_)
 
 
 #if !defined(wxVsnprintf_)
 

+#if !wxUSE_WXVSNPRINTF
+    #error wxUSE_WXVSNPRINTF must be 1 if our wxVsnprintf_ is used
+#endif
+

 // wxUSE_STRUTILS says our wxVsnprintf_ implementation to use or not to
 // use wxStrlen and wxStrncpy functions over one-char processing loops.
 //
 // wxUSE_STRUTILS says our wxVsnprintf_ implementation to use or not to
 // use wxStrlen and wxStrncpy functions over one-char processing loops.
 //


@@ -213,7 +217,7 @@ enum wxPrintfArgType {
 
     wxPAT_INT,          // %d, %i, %o, %u, %x, %X
     wxPAT_LONGINT,      // %ld, etc
 
     wxPAT_INT,          // %d, %i, %o, %u, %x, %X
     wxPAT_LONGINT,      // %ld, etc

-#if SIZEOF_LONG_LONG
+#ifdef wxLongLong_t

     wxPAT_LONGLONGINT,  // %Ld, etc
 #endif
     wxPAT_SIZET,        // %Zd, etc
     wxPAT_LONGLONGINT,  // %Ld, etc
 #endif
     wxPAT_SIZET,        // %Zd, etc


@@ -238,8 +242,8 @@ enum wxPrintfArgType {
 typedef union {
     int pad_int;                        //  %d, %i, %o, %u, %x, %X
     long int pad_longint;               // %ld, etc
 typedef union {
     int pad_int;                        //  %d, %i, %o, %u, %x, %X
     long int pad_longint;               // %ld, etc

-#if SIZEOF_LONG_LONG
-    long long int pad_longlongint;      // %Ld, etc
+#ifdef wxLongLong_t
+    wxLongLong_t pad_longlongint;      // %Ld, etc

 #endif
     size_t pad_sizet;                   // %Zd, etc
 
 #endif
     size_t pad_sizet;                   // %Zd, etc
 


@@ -347,7 +351,8 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
 
     // temporary parse data
     size_t flagofs = 1;
 
     // temporary parse data
     size_t flagofs = 1;

-    bool in_prec, prec_dot;
+    bool in_prec,       // true if we found the dot in some previous iteration
+         prec_dot;      // true if the dot has been already added to m_szFlags

     int ilen = 0;
 
     m_bAlignLeft = in_prec = prec_dot = false;
     int ilen = 0;
 
     m_bAlignLeft = in_prec = prec_dot = false;


@@ -417,6 +422,25 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
                 CHECK_PREC
                 m_szFlags[flagofs++] = char(ch);
                 break;
                 CHECK_PREC
                 m_szFlags[flagofs++] = char(ch);
                 break;

+#ifdef __WXMSW__
+            // under Windows we support the special '%I64' notation as longlong
+            // integer conversion specifier for MSVC compatibility
+            // (it behaves exactly as '%lli' or '%Li' or '%qi')
+            case wxT('I'):
+                if (*(m_pArgEnd+1) != wxT('6') ||
+                    *(m_pArgEnd+2) != wxT('4'))
+                    return false;       // bad format
+
+                m_pArgEnd++;
+                m_pArgEnd++;
+
+                ilen = 2;
+                CHECK_PREC
+                m_szFlags[flagofs++] = char(ch);
+                m_szFlags[flagofs++] = '6';
+                m_szFlags[flagofs++] = '4';
+                break;
+#endif      // __WXMSW__

 
             case wxT('Z'):
                 ilen = 3;
 
             case wxT('Z'):
                 ilen = 3;


@@ -508,11 +532,11 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
                 else if (ilen == 1)
                     m_type = wxPAT_LONGINT;
                 else if (ilen == 2)
                 else if (ilen == 1)
                     m_type = wxPAT_LONGINT;
                 else if (ilen == 2)

-#if SIZEOF_LONG_LONG
+#ifdef wxLongLong_t

                     m_type = wxPAT_LONGLONGINT;
                     m_type = wxPAT_LONGLONGINT;

-#else // !long long
+#else // !wxLongLong_t

                     m_type = wxPAT_LONGINT;
                     m_type = wxPAT_LONGINT;

-#endif // long long/!long long
+#endif // wxLongLong_t/!wxLongLong_t

                 else if (ilen == 3)
                     m_type = wxPAT_SIZET;
                 done = true;
                 else if (ilen == 3)
                     m_type = wxPAT_SIZET;
                 done = true;


@@ -678,11 +702,11 @@ bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr)
         case wxPAT_LONGINT:
             p->pad_longint = va_arg(argptr, long int);
             break;
         case wxPAT_LONGINT:
             p->pad_longint = va_arg(argptr, long int);
             break;

-#if SIZEOF_LONG_LONG
+#ifdef wxLongLong_t

         case wxPAT_LONGLONGINT:
         case wxPAT_LONGLONGINT:

-            p->pad_longlongint = va_arg(argptr, long long int);
+            p->pad_longlongint = va_arg(argptr, wxLongLong_t);

             break;
             break;

-#endif
+#endif // wxLongLong_t

         case wxPAT_SIZET:
             p->pad_sizet = va_arg(argptr, size_t);
             break;
         case wxPAT_SIZET:
             p->pad_sizet = va_arg(argptr, size_t);
             break;


@@ -762,7 +786,7 @@ int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p, size_t
             lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longint);
             break;
 
             lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longint);
             break;
 

-#if SIZEOF_LONG_LONG
+#ifdef wxLongLong_t

         case wxPAT_LONGLONGINT:
             lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longlongint);
             break;
         case wxPAT_LONGLONGINT:
             lenScratch = system_sprintf(szScratch, wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN, m_szFlags, p->pad_longlongint);
             break;


@@ -928,7 +952,7 @@ int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p, size_t
     {
         case wxPAT_INT:
         case wxPAT_LONGINT:
     {
         case wxPAT_INT:
         case wxPAT_LONGINT:

-#if SIZEOF_LONG_LONG
+#ifdef wxLongLong_t

         case wxPAT_LONGLONGINT:
 #endif
         case wxPAT_SIZET:
         case wxPAT_LONGLONGINT:
 #endif
         case wxPAT_SIZET:


@@ -1124,6 +1148,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
     va_end(ap);
 
     // something failed while loading arguments from the variable list...
     va_end(ap);
 
     // something failed while loading arguments from the variable list...

+    // (e.g. the user repeated twice the same positional argument)

     if (!ok)
     {
         buf[0] = 0;
     if (!ok)
     {
         buf[0] = 0;


@@ -1143,7 +1168,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         if (lenCur == lenMax)
         {
             buf[lenMax - 1] = 0;
         if (lenCur == lenMax)
         {
             buf[lenMax - 1] = 0;

-            return -1;
+            return lenMax+1;      // not enough space in the output buffer !

         }
 
         // process this specifier directly in the output buffer
         }
 
         // process this specifier directly in the output buffer


@@ -1151,7 +1176,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         if (n == -1)
         {
             buf[lenMax-1] = wxT('\0');  // be sure to always NUL-terminate the string
         if (n == -1)
         {
             buf[lenMax-1] = wxT('\0');  // be sure to always NUL-terminate the string

-            return -1;      // not enough space in the output buffer !
+            return lenMax+1;      // not enough space in the output buffer !

         }
         lenCur += n;
 
         }
         lenCur += n;
 


@@ -1171,7 +1196,7 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
     if (buf[lenCur])
     {
         buf[lenCur] = 0;
     if (buf[lenCur])
     {
         buf[lenCur] = 0;

-        return -1;
+        return lenMax+1;     // not enough space in the output buffer !

     }
 
     wxASSERT(lenCur == wxStrlen(buf));
     }
 
     wxASSERT(lenCur == wxStrlen(buf));


@@ -1182,7 +1207,13 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
 #undef APPEND_STR
 #undef CHECK_PREC
 
 #undef APPEND_STR
 #undef CHECK_PREC
 

-#endif // !wxVsnprintfA
+#else    // wxVsnprintf_ is defined
+
+#if wxUSE_WXVSNPRINTF
+    #error wxUSE_WXVSNPRINTF must be 0 if our wxVsnprintf_ is not used
+#endif
+
+#endif // !wxVsnprintf_

 
 #if !defined(wxSnprintf_)
 int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
 
 #if !defined(wxSnprintf_)
 int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)


@@ -1222,9 +1253,13 @@ int WXDLLEXPORT wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...)
 #ifdef wxNEED_FPUTS
 int wxFputs(const wchar_t *ws, FILE *stream)
 {
 #ifdef wxNEED_FPUTS
 int wxFputs(const wchar_t *ws, FILE *stream)
 {

+    wxCharBuffer buf(wxConvLibc.cWC2MB(ws));
+    if ( !buf )
+        return -1;
+

     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error
     // counting the number of wide characters written isn't worth the trouble,
     // simply distinguish between ok and error

-    return fputs(wxConvLibc.cWC2MB(ws), stream) == -1 ? -1 : 0;
+    return fputs(buf, stream) == -1 ? -1 : 0;

 }
 #endif // wxNEED_FPUTS
 
 }
 #endif // wxNEED_FPUTS