1 files changed, 31 insertions, 21 deletions

diff --git a/CPP/7zip/UI/FileManager/OverwriteDialog.h b/CPP/7zip/UI/FileManager/OverwriteDialog.h
index a9ca991..9f0801d 100644
--- a/CPP/7zip/UI/FileManager/OverwriteDialog.h
+++ b/CPP/7zip/UI/FileManager/OverwriteDialog.h
@@ -12,68 +12,78 @@ namespace NOverwriteDialog
 {
   struct CFileInfo
   {
-    bool SizeIsDefined;
-    bool TimeIsDefined;
+    bool Size_IsDefined;
+    bool Time_IsDefined;
+    bool Is_FileSystemFile;
     UInt64 Size;
     FILETIME Time;
-    UString Name;
+    UString Path;
+
+    void SetTime(const FILETIME &t)
+    {
+      Time = t;
+      Time_IsDefined = true;
+    }
     
-    void SetTime(const FILETIME *t)
+    void SetTime2(const FILETIME *t)
     {
       if (!t)
-        TimeIsDefined = false;
+        Time_IsDefined = false;
       else
-      {
-        TimeIsDefined = true;
-        Time = *t;
-      }
+        SetTime(*t);
     }
 
     void SetSize(UInt64 size)
     {
-      SizeIsDefined = true;
       Size = size;
+      Size_IsDefined = true;
     }
 
-    void SetSize(const UInt64 *size)
+    void SetSize2(const UInt64 *size)
     {
       if (!size)
-        SizeIsDefined = false;
+        Size_IsDefined = false;
       else
         SetSize(*size);
     }
+
+    CFileInfo():
+      Size_IsDefined(false),
+      Time_IsDefined(false),
+      Is_FileSystemFile(false)
+      {}
   };
 }
 
 class COverwriteDialog: public NWindows::NControl::CModalDialog
 {
+#ifdef UNDER_CE
   bool _isBig;
+#endif
 
-  void SetFileInfoControl(unsigned textID, unsigned iconID, const NOverwriteDialog::CFileInfo &fileInfo);
+  void SetItemIcon(unsigned iconID, HICON hIcon);
+  void SetFileInfoControl(const NOverwriteDialog::CFileInfo &fileInfo, unsigned textID, unsigned iconID, unsigned iconID_2);
   virtual bool OnInit() Z7_override;
+  virtual bool OnDestroy() Z7_override;
   virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
   void ReduceString(UString &s);
 
 public:
   bool ShowExtraButtons;
   bool DefaultButton_is_NO;
-
+  NOverwriteDialog::CFileInfo OldFileInfo;
+  NOverwriteDialog::CFileInfo NewFileInfo;
 
   COverwriteDialog(): ShowExtraButtons(true), DefaultButton_is_NO(false) {}
 
   INT_PTR Create(HWND parent = NULL)
   {
+#ifdef UNDER_CE
     BIG_DIALOG_SIZE(280, 200);
-    #ifdef UNDER_CE
     _isBig = isBig;
-    #else
-    _isBig = true;
-    #endif
+#endif
     return CModalDialog::Create(SIZED_DIALOG(IDD_OVERWRITE), parent);
   }
-
-  NOverwriteDialog::CFileInfo OldFileInfo;
-  NOverwriteDialog::CFileInfo NewFileInfo;
 };
 
 #endif