Make m_typeflag an int.

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

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index adb5cb7cbf4967e9f25becc37afc1efb63ca2cfa..714156d9764dca5dcc5137041d31519f2ae5873b 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -133,7 +133,7 @@ private:
     wxDateTime   m_ModifyTime;
     wxDateTime   m_AccessTime;
     wxDateTime   m_CreateTime;
-    wxChar       m_TypeFlag;
+    int          m_TypeFlag;
     wxString     m_LinkName;
     wxString     m_UserName;
     wxString     m_GroupName;

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index 65fc6a2763fea559ea6202bfc7235be189ca066b..ea47b5bc1fb07d3fb3541677c7514d674c7f0b19 100644 (file)
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -529,14 +529,14 @@ wxString wxTarEntry::GetInternalName(const wxString& name,
 
 bool wxTarEntry::IsDir() const
 {
-    return m_TypeFlag - wxTAR_DIRTYPE == 0;
+    return m_TypeFlag == wxTAR_DIRTYPE;
 }
 
 void wxTarEntry::SetIsDir(bool isDir)
 {
     if (isDir)
         m_TypeFlag = wxTAR_DIRTYPE;
-    else if (m_TypeFlag - wxTAR_DIRTYPE == 0)
+    else if (m_TypeFlag == wxTAR_DIRTYPE)
         m_TypeFlag = wxTAR_REGTYPE;
 }