DirCompProgressBar.*: Use Dynamic Dialog Layout for MFC

diff --git a/Src/DirCompProgressBar.cpp b/Src/DirCompProgressBar.cpp
index a4d63e0..432f939 100644 (file)
--- a/Src/DirCompProgressBar.cpp
+++ b/Src/DirCompProgressBar.cpp
@@ -61,7 +61,6 @@ BEGIN_MESSAGE_MAP(DirCompProgressBar, CDialogBar)
        //{{AFX_MSG_MAP(DirCompProgressBar)
        ON_WM_WINDOWPOSCHANGING()
        ON_WM_TIMER()
-       ON_WM_SIZE()
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -167,32 +166,6 @@ void DirCompProgressBar::OnTimer(UINT_PTR nIDEvent)
                CDialogBar::OnTimer(nIDEvent);
 }
 
-void DirCompProgressBar::OnSize(UINT nType, int cx, int cy)
-{
-       CDialogBar::OnSize(nType, cx, cy);
-
-       CWnd *pwndButton = GetDlgItem(IDC_COMPARISON_STOP);
-       CWnd *pwndProgress = GetDlgItem(IDC_PROGRESSCOMPARE);
-       CWnd *pwndStatic = GetDlgItem(IDC_PATH_COMPARING);
-
-       if (pwndButton && pwndProgress && pwndStatic)
-       {
-               CRect rectButton, rectProgress, rectStatic;
-               pwndButton->GetWindowRect(&rectButton);
-               pwndProgress->GetWindowRect(&rectProgress);
-               pwndStatic->GetWindowRect(&rectStatic);
-               ScreenToClient(&rectButton);
-               ScreenToClient(&rectProgress);
-               ScreenToClient(&rectStatic);
-               rectButton.left = cx - rectButton.Width() - rectProgress.left;
-               rectProgress.right = cx - rectProgress.left;
-               rectStatic.right = rectProgress.right;
-               pwndButton->SetWindowPos(NULL, rectButton.left, rectButton.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);
-               pwndProgress->SetWindowPos(NULL, 0, 0, rectProgress.Width(), rectProgress.Height(), SWP_NOZORDER|SWP_NOMOVE);
-               pwndStatic->SetWindowPos(NULL, 0, 0, rectStatic.Width(), rectStatic.Height(), SWP_NOZORDER|SWP_NOMOVE);
-       }
-}
-
 /**
  * @brief Start timer for UI updating.
  */

diff --git a/Src/DirCompProgressBar.h b/Src/DirCompProgressBar.h
index b0dc440..3727c21 100644 (file)
--- a/Src/DirCompProgressBar.h
+++ b/Src/DirCompProgressBar.h
@@ -55,7 +55,6 @@ protected:
        // Generated message map functions
        //{{AFX_MSG(DirCompProgressBar)
        afx_msg void OnTimer(UINT_PTR nIDEvent);
-       afx_msg void OnSize(UINT nType, int cx, int cy);
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 79fe612..2e3dde9 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1731,6 +1731,40 @@ END
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
+// DESIGNINFO\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+GUIDELINES DESIGNINFO\r
+BEGIN\r
+    IDD_DIRCOMP_PROGRESS, DIALOG\r
+    BEGIN\r
+    END\r
+END\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// AFX_DIALOG_LAYOUT\r
+//\r
+\r
+IDD_DIRCOMP_PROGRESS AFX_DIALOG_LAYOUT\r
+BEGIN\r
+    0,\r
+    100, 0, 0, 0,\r
+    0, 0, 100, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 0, 0,\r
+    0, 0, 0, 0\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
 // String Table\r
 //\r
 \r