added wxConvFileName which is a variable, not define as wxConvFile; added comments...

[wxWidgets.git] / include / wx / zipstrm.h

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 7b83d0bc0b122773ec43c4f7cecf229f61b850bd..976a17050b9156409de9aabaad723eb0e6591458 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -164,7 +164,7 @@ public:
     // set accessors
     void SetDateTime(const wxDateTime& dt)      { m_DateTime = dt; }
     void SetSize(wxFileOffset size)             { m_Size = size; }
     // set accessors
     void SetDateTime(const wxDateTime& dt)      { m_DateTime = dt; }
     void SetSize(wxFileOffset size)             { m_Size = size; }

-    void SetMethod(int method)                  { m_Method = method; }
+    void SetMethod(int method)                  { m_Method = (wxUint16)method; }

     void SetComment(const wxString& comment)    { m_Comment = comment; }
     void SetExternalAttributes(wxUint32 attr )  { m_ExternalAttributes = attr; }
     void SetSystemMadeBy(int system);
     void SetComment(const wxString& comment)    { m_Comment = comment; }
     void SetExternalAttributes(wxUint32 attr )  { m_ExternalAttributes = attr; }
     void SetSystemMadeBy(int system);


@@ -200,15 +200,15 @@ protected:
     int GetDiskStart() const                    { return m_DiskStart; }
     int GetInternalAttributes() const           { return m_InternalAttributes; }
 
     int GetDiskStart() const                    { return m_DiskStart; }
     int GetInternalAttributes() const           { return m_InternalAttributes; }
 

-    void SetVersionNeeded(int version)          { m_VersionNeeded = version; }
+    void SetVersionNeeded(int version)          { m_VersionNeeded = (wxUint16)version; }

     void SetOffset(wxFileOffset offset)         { m_Offset = offset; }
     void SetOffset(wxFileOffset offset)         { m_Offset = offset; }

-    void SetFlags(int flags)                    { m_Flags = flags; }
-    void SetVersionMadeBy(int version)          { m_VersionMadeBy = version; }
+    void SetFlags(int flags)                    { m_Flags = (wxUint16)flags; }
+    void SetVersionMadeBy(int version)          { m_VersionMadeBy = (wxUint8)version; }

     void SetCrc(wxUint32 crc)                   { m_Crc = crc; }
     void SetCompressedSize(wxFileOffset size)   { m_CompressedSize = size; }
     void SetKey(wxFileOffset offset)            { m_Key = offset; }
     void SetCrc(wxUint32 crc)                   { m_Crc = crc; }
     void SetCompressedSize(wxFileOffset size)   { m_CompressedSize = size; }
     void SetKey(wxFileOffset offset)            { m_Key = offset; }

-    void SetDiskStart(int start)                { m_DiskStart = start; }
-    void SetInternalAttributes(int attr)        { m_InternalAttributes = attr; }
+    void SetDiskStart(int start)                { m_DiskStart = (wxUint16)start; }
+    void SetInternalAttributes(int attr)        { m_InternalAttributes = (wxUint16)attr; }

 
     virtual wxZipEntry *ZipClone() const        { return new wxZipEntry(*this); }
 
 
     virtual wxZipEntry *ZipClone() const        { return new wxZipEntry(*this); }
 


@@ -419,12 +419,31 @@ private:
 };
 
 
 };
 
 

+/////////////////////////////////////////////////////////////////////////////
+// Iterators
+
+#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
+typedef wxArchiveIterator<wxZipInputStream> wxZipIter;
+typedef wxArchiveIterator<wxZipInputStream,
+         std::pair<wxString, wxZipEntry*> > wxZipPairIter;
+#endif
+
+

 /////////////////////////////////////////////////////////////////////////////
 // wxZipClassFactory
 
 class WXDLLIMPEXP_BASE wxZipClassFactory : public wxArchiveClassFactory
 {
 public:
 /////////////////////////////////////////////////////////////////////////////
 // wxZipClassFactory
 
 class WXDLLIMPEXP_BASE wxZipClassFactory : public wxArchiveClassFactory
 {
 public:

+    typedef wxZipEntry        entry_type;
+    typedef wxZipInputStream  instream_type;
+    typedef wxZipOutputStream outstream_type;
+    typedef wxZipNotifier     notifier_type;
+#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
+    typedef wxZipIter         iter_type;
+    typedef wxZipPairIter     pairiter_type;
+#endif
+

     wxZipEntry *NewEntry() const
         { return new wxZipEntry; }
     wxZipInputStream *NewStream(wxInputStream& stream) const
     wxZipEntry *NewEntry() const
         { return new wxZipEntry; }
     wxZipInputStream *NewStream(wxInputStream& stream) const


@@ -449,35 +468,25 @@ private:
 };
 
 
 };
 
 

-/////////////////////////////////////////////////////////////////////////////
-// Iterators
-
-#if wxUSE_STL || defined WX_TEST_ARCHIVE_ITERATOR
-typedef wxArchiveIterator<wxZipInputStream> wxZipIter;
-typedef wxArchiveIterator<wxZipInputStream,
-         std::pair<wxString, wxZipEntry*> >  wxZipPairIter;
-#endif
-
-

 /////////////////////////////////////////////////////////////////////////////
 // wxZipEntry inlines
 
 /////////////////////////////////////////////////////////////////////////////
 // wxZipEntry inlines
 

-bool wxZipEntry::IsText() const
+inline bool wxZipEntry::IsText() const

 {
     return (m_InternalAttributes & TEXT_ATTR) != 0;
 }
 
 {
     return (m_InternalAttributes & TEXT_ATTR) != 0;
 }
 

-bool wxZipEntry::IsDir() const
+inline bool wxZipEntry::IsDir() const

 {
     return (m_ExternalAttributes & wxZIP_A_SUBDIR) != 0;
 }
 
 {
     return (m_ExternalAttributes & wxZIP_A_SUBDIR) != 0;
 }
 

-bool wxZipEntry::IsReadOnly() const
+inline bool wxZipEntry::IsReadOnly() const

 {
     return (m_ExternalAttributes & wxZIP_A_RDONLY) != 0;
 }
 
 {
     return (m_ExternalAttributes & wxZIP_A_RDONLY) != 0;
 }
 

-bool wxZipEntry::IsMadeByUnix() const
+inline bool wxZipEntry::IsMadeByUnix() const

 {
     const int pattern =
         (1 << wxZIP_SYSTEM_OPENVMS) |
 {
     const int pattern =
         (1 << wxZIP_SYSTEM_OPENVMS) |


@@ -492,7 +501,7 @@ bool wxZipEntry::IsMadeByUnix() const
         || ((pattern >> m_SystemMadeBy) & 1);
 }
 
         || ((pattern >> m_SystemMadeBy) & 1);
 }
 

-void wxZipEntry::SetIsText(bool isText)
+inline void wxZipEntry::SetIsText(bool isText)

 {
     if (isText)
         m_InternalAttributes |= TEXT_ATTR;
 {
     if (isText)
         m_InternalAttributes |= TEXT_ATTR;


@@ -500,7 +509,7 @@ void wxZipEntry::SetIsText(bool isText)
         m_InternalAttributes &= ~TEXT_ATTR;
 }
 
         m_InternalAttributes &= ~TEXT_ATTR;
 }
 

-void wxZipEntry::SetIsReadOnly(bool isReadOnly)
+inline void wxZipEntry::SetIsReadOnly(bool isReadOnly)

 {
     if (isReadOnly)
         SetMode(GetMode() & ~0222);
 {
     if (isReadOnly)
         SetMode(GetMode() & ~0222);


@@ -508,8 +517,8 @@ void wxZipEntry::SetIsReadOnly(bool isReadOnly)
         SetMode(GetMode() | 0200);
 }
 
         SetMode(GetMode() | 0200);
 }
 

-void wxZipEntry::SetName(const wxString& name,
-                         wxPathFormat format /*=wxPATH_NATIVE*/)
+inline void wxZipEntry::SetName(const wxString& name,
+                                wxPathFormat format /*=wxPATH_NATIVE*/)

 {
     bool isDir;
     m_Name = GetInternalName(name, format, &isDir);
 {
     bool isDir;
     m_Name = GetInternalName(name, format, &isDir);