Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / AboutDlg.h

diff --git a/Src/AboutDlg.h b/Src/AboutDlg.h
index 6c97bef..8c0a2ed 100644 (file)
--- a/Src/AboutDlg.h
+++ b/Src/AboutDlg.h
@@ -22,46 +22,26 @@
  */
 #pragma once
 
-#include "statlink.h"
-#include "Picture.h"
-#include "resource.h" // IDD_ABOUTBOX
+#include <memory>
+#include <Poco/BasicEvent.h>
+#include "UnicodeString.h"
+#include "MergeApp.h"
 
-/** 
- * @brief About-dialog class.
- * 
- * Shows About-dialog bitmap and draws version number and other
- * texts into it.
- */
-class CAboutDlg : public CDialog
+class CAboutDlg
 {
+// Construction
 public:
        CAboutDlg();
+       ~CAboutDlg();
+       int DoModal();
 
-// Dialog Data
-       //{{AFX_DATA(CAboutDlg)
-       enum { IDD = IDD_ABOUTBOX };
-       CStatic m_ctlCompany;
-       CStaticLink     m_ctlWWW;
-       CString m_strVersion;
-       CString m_strPrivateBuild;
-       CPicture m_image;
-       CFont m_font;
-       //}}AFX_DATA
+       AboutInfo m_info;
+       Poco::BasicEvent<int> m_onclick_contributers;
 
-       // ClassWizard generated virtual function overrides
-       //{{AFX_VIRTUAL(CAboutDlg)
-       protected:
-       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-       //}}AFX_VIRTUAL
+private:
+       CAboutDlg(const CAboutDlg &);
+       CAboutDlg & operator=(const CAboutDlg &);
 
-// Implementation
-protected:
-       //{{AFX_MSG(CAboutDlg)
-       virtual BOOL OnInitDialog();
-       //}}AFX_MSG
-       DECLARE_MESSAGE_MAP()
-public:
-       afx_msg void OnBnClickedOpenContributors();
-       afx_msg void OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct);
-       afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+       class Impl;
+       std::unique_ptr<Impl> m_pimpl;
 };