font is only non default if it has non default field values

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

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 7ac3f254a2fd960f5c32a4910c20b8277d4c25e6..964324306b8c1817a44282e8df5ac4716eb3b7b2 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1013,11 +1013,15 @@ wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll)
   return uiCount;
 }
 
+#ifdef __WXWINCE__
+inline int isascii(wxChar c) { return (c >= 0) && (c <=127); }
+#endif
+
 bool wxString::IsAscii() const
 {
   const wxChar *s = (const wxChar*) *this;
   while(*s){
-    if(!wxIsascii(*s)) return(FALSE);
+    if(!isascii(*s)) return(FALSE);
     s++;
   }
   return(TRUE);
@@ -1759,10 +1763,10 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
 // ArrayString
 // ============================================================================
 
-#if !wxUSE_STL
-
 #include "wx/arrstr.h"
 
+#if !wxUSE_STL
+
 // size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
 #define   ARRAY_MAXSIZE_INCREMENT       4096