24.0524.05

3 files changed, 22 insertions, 2 deletions

diff --git a/CPP/Windows/Control/Dialog.cpp b/CPP/Windows/Control/Dialog.cpp
index c8f1bd2..cbb000b 100644
--- a/CPP/Windows/Control/Dialog.cpp
+++ b/CPP/Windows/Control/Dialog.cpp
@@ -93,6 +93,7 @@ bool CDialog::OnButtonClicked(unsigned buttonID, HWND /* buttonHWND */)
     case IDOK: OnOK(); break;
     case IDCANCEL: OnCancel(); break;
     case IDCLOSE: OnClose(); break;
+    case IDCONTINUE: OnContinue(); break;
     case IDHELP: OnHelp(); break;
     default: return false;
   }
diff --git a/CPP/Windows/Control/Dialog.h b/CPP/Windows/Control/Dialog.h
index 06be4bf..2510c8f 100644
--- a/CPP/Windows/Control/Dialog.h
+++ b/CPP/Windows/Control/Dialog.h
@@ -8,6 +8,10 @@
 namespace NWindows {
 namespace NControl {
 
+#ifndef IDCONTINUE
+#define IDCONTINUE 11
+#endif
+
 class CDialog: public CWindow
 {
   // Z7_CLASS_NO_COPY(CDialog)
@@ -64,14 +68,26 @@ public:
     return window.GetText(s);
   }
 
+/*
   bool SetItemInt(unsigned itemID, UINT value, bool isSigned)
     { return BOOLToBool(SetDlgItemInt(_window, (int)itemID, value, BoolToBOOL(isSigned))); }
+*/
+  bool SetItemUInt(unsigned itemID, UINT value)
+    { return BOOLToBool(SetDlgItemInt(_window, (int)itemID, value, FALSE)); }
+/*
   bool GetItemInt(unsigned itemID, bool isSigned, UINT &value)
   {
     BOOL result;
     value = GetDlgItemInt(_window, (int)itemID, &result, BoolToBOOL(isSigned));
     return BOOLToBool(result);
   }
+*/
+  bool GetItemUInt(unsigned itemID, UINT &value)
+  {
+    BOOL result;
+    value = GetDlgItemInt(_window, (int)itemID, &result, FALSE);
+    return BOOLToBool(result);
+  }
 
   HWND GetNextGroupItem(HWND control, bool previous)
     { return GetNextDlgGroupItem(_window, control, BoolToBOOL(previous)); }
@@ -126,6 +142,7 @@ public:
 
   virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND);
   virtual void OnOK() {}
+  virtual void OnContinue() {}
   virtual void OnCancel() {}
   virtual void OnClose() {}
   virtual bool OnNotify(UINT /* controlID */, LPNMHDR /* lParam */) { return false; }
@@ -157,6 +174,7 @@ public:
   bool Create(LPCWSTR templateName, HWND parentWindow);
   #endif
   virtual void OnOK() Z7_override { Destroy(); }
+  virtual void OnContinue() Z7_override { Destroy(); }
   virtual void OnCancel() Z7_override { Destroy(); }
   virtual void OnClose() Z7_override { Destroy(); }
 };
@@ -172,6 +190,7 @@ public:
 
   bool End(INT_PTR result) { return BOOLToBool(::EndDialog(_window, result)); }
   virtual void OnOK() Z7_override { End(IDOK); }
+  virtual void OnContinue() Z7_override { End(IDCONTINUE); }
   virtual void OnCancel() Z7_override { End(IDCANCEL); }
   virtual void OnClose() Z7_override { End(IDCLOSE); }
 };
diff --git a/CPP/Windows/Control/PropertyPage.cpp b/CPP/Windows/Control/PropertyPage.cpp
index f8effe6..9b36cbe 100644
--- a/CPP/Windows/Control/PropertyPage.cpp
+++ b/CPP/Windows/Control/PropertyPage.cpp
@@ -141,7 +141,7 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
     sheet.pszCaption = titleA;
     sheet.nPages = pagesA.Size();
     sheet.nStartPage = 0;
-    sheet.ppsp = (LPCPROPSHEETPAGEA)(const void *)&pagesA.Front();
+    sheet.ppsp = (LPCPROPSHEETPAGEA)(const void *)pagesA.ConstData();
     sheet.pfnCallback = NULL;
     return ::PropertySheetA(&sheet);
   }
@@ -156,7 +156,7 @@ INT_PTR MyPropertySheet(const CObjectVector<CPageInfo> &pagesInfo, HWND hwndPare
     sheet.pszCaption = title;
     sheet.nPages = pagesW.Size();
     sheet.nStartPage = 0;
-    sheet.ppsp = (LPCPROPSHEETPAGEW)(const void *)&pagesW.Front();
+    sheet.ppsp = (LPCPROPSHEETPAGEW)(const void *)pagesW.ConstData();
     sheet.pfnCallback = NULL;
     return ::PropertySheetW(&sheet);
   }