Support float, double and file name values in wxGenericValidator.

[wxWidgets.git] / src / common / zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 4282806175155a3d379dba6bf98060e046c2c502..4902738a07aaf7bed96e3e1c1a17a27bc3b8c998 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -1341,7 +1341,7 @@ void wxZipInputStream::Init(const wxString& file)
     ffile = static_cast<wxFFileInputStream*>(m_parent_i_stream);
     wxZipEntryPtr_ entry;
 
     ffile = static_cast<wxFFileInputStream*>(m_parent_i_stream);
     wxZipEntryPtr_ entry;
 

-    if (ffile->Ok()) {
+    if (ffile->IsOk()) {

         do {
             entry.reset(GetNextEntry());
         }
         do {
             entry.reset(GetNextEntry());
         }


@@ -1773,7 +1773,7 @@ bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/)
     return IsOk();
 }
 
     return IsOk();
 }
 

-// Can be overriden to add support for additional decompression methods
+// Can be overridden to add support for additional decompression methods

 //
 wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
 {
 //
 wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
 {


@@ -2128,7 +2128,7 @@ bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/)
     return true;
 }
 
     return true;
 }
 

-// Can be overriden to add support for additional compression methods
+// Can be overridden to add support for additional compression methods

 //
 wxOutputStream *wxZipOutputStream::OpenCompressor(
     wxOutputStream& stream,
 //
 wxOutputStream *wxZipOutputStream::OpenCompressor(
     wxOutputStream& stream,