18.0518.05

2 files changed, 4 insertions, 0 deletions

diff --git a/CPP/Windows/Control/Dialog.cpp b/CPP/Windows/Control/Dialog.cpp
index 9df3ef5e..020694a6 100644
--- a/CPP/Windows/Control/Dialog.cpp
+++ b/CPP/Windows/Control/Dialog.cpp
@@ -72,6 +72,7 @@ bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */)
   {
     case IDOK: OnOK(); break;
     case IDCANCEL: OnCancel(); break;
+    case IDCLOSE: OnClose(); break;
     case IDHELP: OnHelp(); break;
     default: return false;
   }
diff --git a/CPP/Windows/Control/Dialog.h b/CPP/Windows/Control/Dialog.h
index 59b9f419..33caa5b2 100644
--- a/CPP/Windows/Control/Dialog.h
+++ b/CPP/Windows/Control/Dialog.h
@@ -105,6 +105,7 @@ public:
   virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
   virtual void OnOK() {};
   virtual void OnCancel() {};
+  virtual void OnClose() {}
   virtual bool OnNotify(UINT /* controlID */, LPNMHDR /* lParam */) { return false; }
   virtual bool OnTimer(WPARAM /* timerID */, LPARAM /* callback */) { return false; }
 
@@ -133,6 +134,7 @@ public:
   #endif
   virtual void OnOK() { Destroy(); }
   virtual void OnCancel() { Destroy(); }
+  virtual void OnClose() { Destroy(); }
 };
 
 class CModalDialog: public CDialog
@@ -147,6 +149,7 @@ public:
   bool End(INT_PTR result) { return BOOLToBool(::EndDialog(_window, result)); }
   virtual void OnOK() { End(IDOK); }
   virtual void OnCancel() { End(IDCANCEL); }
+  virtual void OnClose() { End(IDCLOSE); }
 };
 
 class CDialogChildControl: public NWindows::CWindow