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

wxTextStream now interprets 1,1 as 1.1 (European formating).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-12-13 15:55:30 +00:00
parent 191ab39aee
commit 78e848cac9
4 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/txtstrm.cpp
View File

@@ -150,7 +150,7 @@ double wxTextInputStream::ReadDouble()
if (c==(wxChar)0) return 0;
f = 0.0;
if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
{
m_input.Ungetch(c);
return 0.0;
@@ -177,7 +177,7 @@ double wxTextInputStream::ReadDouble()
c = m_input.GetC();
}
if (c == wxT('.'))
if (c == wxT('.') || c == wxT(','))
{
double f_multiplicator = (double) 0.1;
@@ -418,25 +418,37 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
{
Write16( (wxUint16)c );
wxString str;
str.Printf(wxT("%d"), (signed int)c);
WriteString(str);
return *this;
}
wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
{
Write32( (wxUint32)c );
wxString str;
str.Printf(wxT("%ld"), (signed long)c);
WriteString(str);
return *this;
}
wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
{
Write16(c);
wxString str;
str.Printf(wxT("%u"), (unsigned int)c);
WriteString(str);
return *this;
}
wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
{
Write32(c);
wxString str;
str.Printf(wxT("%lu"), (unsigned long)c);
WriteString(str);
return *this;
}