23.0123.01

1 files changed, 10 insertions, 10 deletions

diff --git a/CPP/Windows/Control/PropertyPage.h b/CPP/Windows/Control/PropertyPage.h
index b68fd8f..264a5d2 100644
--- a/CPP/Windows/Control/PropertyPage.h
+++ b/CPP/Windows/Control/PropertyPage.h
@@ -1,11 +1,11 @@
 // Windows/Control/PropertyPage.h
 
-#ifndef __WINDOWS_CONTROL_PROPERTYPAGE_H
-#define __WINDOWS_CONTROL_PROPERTYPAGE_H
+#ifndef ZIP7_INC_WINDOWS_CONTROL_PROPERTYPAGE_H
+#define ZIP7_INC_WINDOWS_CONTROL_PROPERTYPAGE_H
 
 #include "../../Common/MyWindows.h"
 
-#include <PrSht.h>
+#include <prsht.h>
 
 #include "Dialog.h"
 
@@ -17,23 +17,23 @@ INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, WPARAM wPar
 class CPropertyPage: public CDialog
 {
 public:
-  CPropertyPage(HWND window = NULL): CDialog(window){};
+  CPropertyPage(HWND window = NULL): CDialog(window) {}
   
   void Changed() { PropSheet_Changed(GetParent(), (HWND)*this); }
   void UnChanged() { PropSheet_UnChanged(GetParent(), (HWND)*this); }
 
-  virtual bool OnNotify(UINT controlID, LPNMHDR lParam);
+  virtual bool OnNotify(UINT controlID, LPNMHDR lParam) Z7_override;
 
   virtual bool OnKillActive() { return false; } // false = OK
-  virtual bool OnKillActive(const PSHNOTIFY *) { return OnKillActive(); }
+  virtual bool OnKillActive2(const PSHNOTIFY *) { return OnKillActive(); }
   virtual LONG OnSetActive() { return false; } // false = OK
-  virtual LONG OnSetActive(const PSHNOTIFY *) { return OnSetActive(); }
+  virtual LONG OnSetActive2(const PSHNOTIFY *) { return OnSetActive(); }
   virtual LONG OnApply() { return PSNRET_NOERROR; }
-  virtual LONG OnApply(const PSHNOTIFY *) { return OnApply(); }
+  virtual LONG OnApply2(const PSHNOTIFY *) { return OnApply(); }
   virtual void OnNotifyHelp() {}
-  virtual void OnNotifyHelp(const PSHNOTIFY *) { OnNotifyHelp(); }
+  virtual void OnNotifyHelp2(const PSHNOTIFY *) { OnNotifyHelp(); }
   virtual void OnReset() {}
-  virtual void OnReset(const PSHNOTIFY *) { OnReset(); }
+  virtual void OnReset2(const PSHNOTIFY *) { OnReset(); }
 };
 
 struct CPageInfo