Follow api of wxInputStream (warning fixes).

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index a39d2202b4622055fc4b11b44d42dceee31e515f..8837544255a57a37426b017ce72943d0373599b2 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -1624,7 +1624,7 @@ static bool wxEatWhiteSpace(wxInputStream *is)
             while (!finished)
             {
                 ch = is->GetC();
             while (!finished)
             {
                 ch = is->GetC();

-                if (ch == EOF)
+                if (is->LastRead() == 0)

                     return false;
                 if (ch == '*')
                 {
                     return false;
                 if (ch == '*')
                 {


@@ -1733,7 +1733,7 @@ bool wxGetResourceToken(wxInputStream *is)
             // Escaped characters
             else if (ch == '\\')
             {
             // Escaped characters
             else if (ch == '\\')
             {

-                int newCh = is->GetC();
+                char newCh = is->GetC();

                 if (newCh == '"')
                     actualCh = '"';
                 else if (newCh == 10)
                 if (newCh == '"')
                     actualCh = '"';
                 else if (newCh == 10)