Fix wrong configure test for abi::__forced_unwind in previous commit.

[wxWidgets.git] / demos / life / reader.cpp

diff --git a/demos/life/reader.cpp b/demos/life/reader.cpp
index 8bb48ed375a8d9e2d516d5a8d3fd6df97500c8e4..896f281bdec772ec3fbfd07dbcb1ccf7a0f8b0c9 100644 (file)
--- a/demos/life/reader.cpp
+++ b/demos/life/reader.cpp
@@ -13,10 +13,6 @@
 // headers, declarations, constants
 // ==========================================================================
 
 // headers, declarations, constants
 // ==========================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "reader.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -45,9 +41,9 @@
 
 LifeReader::LifeReader(wxInputStream& is)
 {
 
 LifeReader::LifeReader(wxInputStream& is)
 {

-    wxBufferedInputStream buff_is = wxBufferedInputStream(is);
-    wxTextInputStream     text_is = wxTextInputStream(buff_is);
-    wxString              line, rest; 
+    wxBufferedInputStream buff_is(is);
+    wxTextInputStream     text_is(buff_is);
+    wxString              line, rest;

 
     // check stream
     m_ok = is.IsOk();
 
     // check stream
     m_ok = is.IsOk();


@@ -58,11 +54,11 @@ LifeReader::LifeReader(wxInputStream& is)
     LIFE_CHECKVAL(_("Error reading signature. Not a Life pattern?"));
 
     // read description
     LIFE_CHECKVAL(_("Error reading signature. Not a Life pattern?"));
 
     // read description

-    m_description = wxT("");
+    m_description = wxEmptyString;

     line = text_is.ReadLine();
     while (buff_is.IsOk() && line.StartsWith(wxT("#D"), &rest))
     {
     line = text_is.ReadLine();
     while (buff_is.IsOk() && line.StartsWith(wxT("#D"), &rest))
     {

-        m_description += rest.Trim(FALSE);
+        m_description += rest.Trim(false);

         m_description += wxT("\n");
         line = text_is.ReadLine();
     }
         m_description += wxT("\n");
         line = text_is.ReadLine();
     }


@@ -79,7 +75,7 @@ LifeReader::LifeReader(wxInputStream& is)
     {
         line = ( text_is.ReadLine() ).Trim();
 
     {
         line = ( text_is.ReadLine() ).Trim();
 

-        if (!line.IsEmpty())
+        if (!line.empty())

         {
             if (line.StartsWith(wxT("#P "), &rest))
                 m_shape.Add(rest);
         {
             if (line.StartsWith(wxT("#P "), &rest))
                 m_shape.Add(rest);