Fixes for semicolons, commas and wxSTRING_MAXLEN from Wlodek Szafran.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 20dc9ecbcc039db83eaa09ed3cba57bb08e389d8..4a45c4e343ec0fc9f077a0b6083e25785de460e6 100644 (file)
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -26,7 +26,7 @@
 enum wxRichTextOddEvenPage {
     wxRICHTEXT_PAGE_ODD,
     wxRICHTEXT_PAGE_EVEN,
 enum wxRichTextOddEvenPage {
     wxRICHTEXT_PAGE_ODD,
     wxRICHTEXT_PAGE_EVEN,

-    wxRICHTEXT_PAGE_ALL,
+    wxRICHTEXT_PAGE_ALL

 };
 
 // Header/footer text locations
 };
 
 // Header/footer text locations

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index a677a8a0db6d24302f7f46517bc25968ffc242b8..18412660d74316e395ea0f5c30baa99ff17dbe31 100644 (file)
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -61,7 +61,7 @@ enum {
 };
 
 enum {
 };
 
 enum {

-    TAR_BLOCKSIZE = 512,
+    TAR_BLOCKSIZE = 512

 };
 
 // checksum type
 };
 
 // checksum type


@@ -154,7 +154,7 @@ private:
     static void check();
 };
 
     static void check();
 };
 

-wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock);
+wxDEFINE_SCOPED_PTR_TYPE(wxTarHeaderBlock)

 
 // A table giving the field names and offsets in a tar header block
 const wxTarField wxTarHeaderBlock::fields[] =
 
 // A table giving the field names and offsets in a tar header block
 const wxTarField wxTarHeaderBlock::fields[] =

diff --git a/src/xml/xml.cpp b/src/xml/xml.cpp
index 6a76beb7c62e81220aa8a6cebd50983d25363caf..4c94c15431aa070baaec3ac0894e4418ead8f5b1 100644 (file)
--- a/src/xml/xml.cpp
+++ b/src/xml/xml.cpp
@@ -414,7 +414,7 @@ bool wxXmlDocument::Save(const wxString& filename, int indentstep) const
 // converts Expat-produced string in UTF-8 into wxString using the specified
 // conv or keep in UTF-8 if conv is NULL
 static wxString CharToString(wxMBConv *conv,
 // converts Expat-produced string in UTF-8 into wxString using the specified
 // conv or keep in UTF-8 if conv is NULL
 static wxString CharToString(wxMBConv *conv,

-                                    const char *s, size_t len = wxSTRING_MAXLEN)
+                                    const char *s, size_t len = wxString::npos)

 {
 #if wxUSE_UNICODE
     wxUnusedVar(conv);
 {
 #if wxUSE_UNICODE
     wxUnusedVar(conv);


@@ -426,13 +426,13 @@ static wxString CharToString(wxMBConv *conv,
         // there can be no embedded NULs in this string so we don't need the
         // output length, it will be NUL-terminated
         const wxWCharBuffer wbuf(
         // there can be no embedded NULs in this string so we don't need the
         // output length, it will be NUL-terminated
         const wxWCharBuffer wbuf(

-            wxConvUTF8.cMB2WC(s, len == wxSTRING_MAXLEN ? wxNO_LEN : len, NULL));
+            wxConvUTF8.cMB2WC(s, len == wxString::npos ? wxNO_LEN : len, NULL));

 
         return wxString(wbuf, *conv);
     }
     else // already in UTF-8, no conversion needed
     {
 
         return wxString(wbuf, *conv);
     }
     else // already in UTF-8, no conversion needed
     {

-        return wxString(s, len != wxSTRING_MAXLEN ? len : strlen(s));
+        return wxString(s, len != wxString::npos ? len : strlen(s));

     }
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 }
     }
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 }