Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for semicolons, commas and wxSTRING_MAXLEN from Wlodek Szafran.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-10-29 07:37:09 +00:00
parent c64c9cd3ba
commit 6df6e35a3e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtextprint.h
View File

@@ -26,7 +26,7 @@
enum wxRichTextOddEvenPage { enum wxRichTextOddEvenPage {
wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_ODD,
wxRICHTEXT_PAGE_EVEN, wxRICHTEXT_PAGE_EVEN,
wxRICHTEXT_PAGE_ALL, wxRICHTEXT_PAGE_ALL
}; };
// Header/footer text locations // Header/footer text locations

4
src/common/tarstrm.cpp
View File

@@ -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 // A table giving the field names and offsets in a tar header block
const wxTarField wxTarHeaderBlock::fields[] = const wxTarField wxTarHeaderBlock::fields[] =

6
src/xml/xml.cpp
View File

@@ -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 // converts Expat-produced string in UTF-8 into wxString using the specified
// conv or keep in UTF-8 if conv is NULL // conv or keep in UTF-8 if conv is NULL
static wxString CharToString(wxMBConv *conv, static wxString CharToString(wxMBConv *conv,
const char *s, size_t len = wxSTRING_MAXLEN) const char *s, size_t len = wxString::npos)
{ {
#if wxUSE_UNICODE #if wxUSE_UNICODE
wxUnusedVar(conv); 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 // there can be no embedded NULs in this string so we don't need the
// output length, it will be NUL-terminated // output length, it will be NUL-terminated
const wxWCharBuffer wbuf( 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); return wxString(wbuf, *conv);
} }
else // already in UTF-8, no conversion needed 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
} }