Implemented HasContainerColumns() for GTK+

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

diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp
index 4f92e20a3d96f2ef48a67f2e21ba8c943fdec2d0..9c85e471c3f603a8ab271333dca0516c1e68f19d 100644 (file)
--- a/src/common/wxcrt.cpp
+++ b/src/common/wxcrt.cpp
@@ -240,14 +240,14 @@ int /* not wint_t */ wxCRT_FputcW(wchar_t wc, FILE *stream)
 #ifdef wxNEED_WPRINTF
 
 // TODO: implement the scanf() functions
-int vwscanf(const wchar_t *format, va_list argptr)
+static int vwscanf(const wchar_t *format, va_list argptr)
 {
     wxFAIL_MSG( _T("TODO") );
 
     return -1;
 }
 
-int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
+static int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
 {
     // The best we can do without proper Unicode support in glibc is to
     // convert the strings into MB representation and run ANSI version
@@ -262,7 +262,7 @@ int vswscanf(const wchar_t *ws, const wchar_t *format, va_list argptr)
     return vsscanf(wxConvLibc.cWX2MB(ws), wxConvLibc.cWX2MB(format), argptr);
 }
 
-int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
+static int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
 {
     wxFAIL_MSG( _T("TODO") );
 
@@ -271,7 +271,7 @@ int vfwscanf(FILE *stream, const wchar_t *format, va_list argptr)
 
 #define vswprintf wxCRT_VsnprintfW
 
-int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
+static int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
 {
     wxString s;
     int rc = s.PrintfV(format, argptr);
@@ -286,7 +286,7 @@ int vfwprintf(FILE *stream, const wchar_t *format, va_list argptr)
     return rc;
 }
 
-int vwprintf(const wchar_t *format, va_list argptr)
+static int vwprintf(const wchar_t *format, va_list argptr)
 {
     return wxCRT_VfprintfW(stdout, format, argptr);
 }
@@ -936,9 +936,9 @@ wxCRT_StrtoullBase(const T* nptr, T** endptr, int base, T* sign)
         unsigned int n;
 
         T c = *i;
-        if ( c >= wxT('0') )
+        if ( c >= '0' )
         {
-            if ( c <= wxT('9') )
+            if ( c <= '9' )
                 n = c - wxT('0');
             else
                 n = wxTolower(c) - wxT('a') + 10;