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

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

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index 01d1c801321742af4e127d534f6b0ed6f4fb8a56..1a841ba15c4b74692f4db8baac99a797a0355cda 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,11 +1,36 @@
 
 

-20th November '99: wxWindows 2.1.12 released
+19th December '99: wxWindows 2.1.12 released

 
 Who has a BigEndian computer (e.g. Sparc) that runs a 15 and/or
 
 Who has a BigEndian computer (e.g. Sparc) that runs a 15 and/or

-16 bit colour mode. I need this for testing purposes, i.e. this
+16 bit colour mode? I need this for testing purposes, i.e. this

 person could help me by running a small testprogram and sending
 me the output.
 
 person could help me by running a small testprogram and sending
 me the output.
 

+Implemented wxMenuBar::Insert() and wxMenu::Insert(). There is
+also a Remove() method now, but the GTK doesn't really like that.
+
+Enhanced wxMimeTypesManager to read GNOME and KDE file ending
+bindings to MIME types and icons.
+
+Corrected wxExecute to longer eat up all memory and crash under
+certain circumstances (Karsten Ballueder).
+
+wxGTK no longer gives warnings if the application shows a dialog
+before entering the main loop.
+
+Updated documentation for wxFile, wxFFile and their respective
+stream classes. Documented some more stream classes.
+
+Improved wxHTML and its help system. Options dialog, better printing,
+history index.
+
+Corrected wxRegion::GetBox().
+
+Added wxNotebookSizer for combining notebooks and sizers.
+
+Added wxDir class. Useful as a replacement for wxFileGetFirst()
+and wxFileGetNext().
+

 Added wxStopWatch class.
 
 wxBitmap now derives from wxGDIObject.
 Added wxStopWatch class.
 
 wxBitmap now derives from wxGDIObject.


@@ -23,7 +48,7 @@ Rewritten wxThread to have a flag controlling if the
 thread will delete its C++ class itself ("delete this") or
 if the main thread must delete the C++ class.
 
 thread will delete its C++ class itself ("delete this") or
 if the main thread must delete the C++ class.
 

-Added TIFF reading code.
+Added TIFF reading code, PCX writing code.

 
 Minor compile and build fixes for different architectures.
 
 
 Minor compile and build fixes for different architectures.
 


@@ -42,14 +67,14 @@ Corrected wrongly set flag in dialogs which broke its tab code.
 Also corrected navigation on wxRadioBox.
 
 Corrected segfaults in wxGLCanvas and stupid race when using
 Also corrected navigation on wxRadioBox.
 
 Corrected segfaults in wxGLCanvas and stupid race when using

-several such windows.
+several such canvasses.

 
 Some minor updates to wxSockets.
 
 Speed-up for new encoding related font code.
 
 
 Some minor updates to wxSockets.
 
 Speed-up for new encoding related font code.
 

-Change wxListCtrl to send deferred events, i.e. events emitted by
-the list ctrl won't get processed before the next idle message.
+Changed wxListBox to send deferred events, i.e. events emitted by
+the listbox won't get processed before the next idle message.

 
 Some more minor changes.
 
 
 Some more minor changes.
 

diff --git a/docs/gtk/todo.txt b/docs/gtk/todo.txt
index 98e91a925e3358be171511c851b7546721b1307b..58c4352b0967fba21e59430db3530da216ded279 100644 (file)
--- a/docs/gtk/todo.txt
+++ b/docs/gtk/todo.txt
@@ -3,9 +3,6 @@
 
 More testing of Unicode support.
 
 
 More testing of Unicode support.
 

-Add ID based i18n system as a replacement for the
-  unelegant gettext system.
-  

 Improve, update translations. Install *.mo files somewehere.
 
 -------------------- Medium priority ---------------------
 Improve, update translations. Install *.mo files somewehere.
 
 -------------------- Medium priority ---------------------

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 44abbdc4c47746fc55b0dc4281f867dc3b55897e..639e063fdbc35afcd74e84511a78303f5a5065fd 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -188,7 +188,7 @@ void MyApp::DoStreamDemo(wxCommandEvent& WXUNUSED(event))
 
     wxFileInputStream file_input( "test_wx.dat" );
     wxBufferedInputStream buf_input( file_input );
 
     wxFileInputStream file_input( "test_wx.dat" );
     wxBufferedInputStream buf_input( file_input );

-    wxTextInputStream text_input( buf_input );
+    wxTextInputStream text_input( file_input );

 
     text_input >> si;
     tmp.Printf( _T("Signed int: %d\n"), si );
 
     text_input >> si;
     tmp.Printf( _T("Signed int: %d\n"), si );

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 2592c03fe1f29fc384656e4ec6765e5bcfc0e199..4f863093a6e6a97ad59c6b0639f7e13aefc5bb34 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -150,7 +150,7 @@ double wxTextInputStream::ReadDouble()
     if (c==(wxChar)0) return 0;
 
     f = 0.0;
     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;
     {
         m_input.Ungetch(c);
         return 0.0;


@@ -177,7 +177,7 @@ double wxTextInputStream::ReadDouble()
         c = m_input.GetC();
     }
 
         c = m_input.GetC();
     }
 

-    if (c == wxT('.'))
+    if (c == wxT('.') || c == wxT(','))

     {
         double f_multiplicator = (double) 0.1;
 
     {
         double f_multiplicator = (double) 0.1;
 


@@ -418,25 +418,37 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 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)
 {
     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)
 {
     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)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {

-    Write32(c);
+    wxString str;
+    str.Printf(wxT("%lu"), (unsigned long)c);
+    WriteString(str);
+

     return *this;
 }
 
     return *this;
 }