*** empty log message ***

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3f8cfe19fd3f990a112a267bf773fe46688b2ae9..bd4dc94a6212c15a199610545ed1af08120a913c 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -113,7 +113,7 @@ extern const wxChar WXDLLEXPORT *wxEmptyString = &g_strEmpty.dummy;
 //       function wxVsnprintfA (A for ANSI), should also find one for Unicode
 //       strings in Unicode build
 #ifdef __WXMSW__
 //       function wxVsnprintfA (A for ANSI), should also find one for Unicode
 //       strings in Unicode build
 #ifdef __WXMSW__

-    #if (defined(__VISUALC__) || defined(wxUSE_NORLANDER_HEADERS)) && !defined(__MINGW32__)
+    #if defined(__VISUALC__) || wxUSE_NORLANDER_HEADERS

         #define wxVsnprintfA     _vsnprintf
     #endif
 #else   // !Windows
         #define wxVsnprintfA     _vsnprintf
     #endif
 #else   // !Windows


@@ -910,6 +910,8 @@ bool wxString::IsWord() const
 bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;
 bool wxString::IsNumber() const
 {
   const wxChar *s = (const wxChar*) *this;

+  if (wxStrlen(s))
+     if ((s[0] == '-') || (s[0] == '+')) s++;

   while(*s){
     if(!wxIsdigit(*s)) return(FALSE);
     s++;
   while(*s){
     if(!wxIsdigit(*s)) return(FALSE);
     s++;