--- /dev/null
+// PropColors.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "merge.h"
+#include "PropColors.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropColors dialog
+
+
+CPropColors::CPropColors( COLORREF clrDiff, COLORREF clrSelDiff )
+ : CPropertyPage(CPropColors::IDD), m_clrDiff(clrDiff), m_clrSelDiff(clrSelDiff),
+ m_cDiff(clrDiff), m_cSelDiff(clrSelDiff)
+{
+ //{{AFX_DATA_INIT(CPropColors)
+ // NOTE: the ClassWizard will add member initialization here
+ //}}AFX_DATA_INIT
+}
+
+
+void CPropColors::DoDataExchange(CDataExchange* pDX)
+{
+ CDialog::DoDataExchange(pDX);
+ //{{AFX_DATA_MAP(CPropColors)
+ DDX_Control(pDX, IDC_SEL_DIFFERENCE_COLOR, m_cSelDiff);
+ DDX_Control(pDX, IDC_DIFFERENCE_COLOR, m_cDiff);
+ //}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(CPropColors, CDialog)
+ //{{AFX_MSG_MAP(CPropColors)
+ ON_BN_CLICKED(IDC_DIFFERENCE_COLOR, OnDifferenceColor)
+ ON_BN_CLICKED(IDC_SEL_DIFFERENCE_COLOR, OnSelDifferenceColor)
+ //}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropColors message handlers
+
+void CPropColors::OnDifferenceColor()
+{
+ CColorDialog dialog( m_clrDiff );
+
+ if ( dialog.DoModal() == IDOK ) {
+
+ m_clrDiff = dialog.GetColor();
+
+ m_cDiff.SetColor( m_clrDiff );
+ }
+}
+
+void CPropColors::OnSelDifferenceColor()
+{
+ CColorDialog dialog( m_clrSelDiff );
+
+ if ( dialog.DoModal() == IDOK ) {
+
+ m_clrSelDiff = dialog.GetColor();
+
+ m_cSelDiff.SetColor( m_clrSelDiff );
+ }
+}
--- /dev/null
+#if !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)
+#define AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// PropColors.h : header file
+//
+
+#include "ColorButton.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CPropColors dialog
+
+class CPropColors : public CPropertyPage
+{
+// Construction
+public:
+
+ CPropColors( COLORREF clrDiff, COLORREF clrSelDiff ); // standard constructor
+
+// Dialog Data
+ //{{AFX_DATA(CPropColors)
+ enum { IDD = IDD_PROPPAGE_COLORS };
+ CColorButton m_cSelDiff;
+ CColorButton m_cDiff;
+ //}}AFX_DATA
+
+
+ COLORREF m_clrDiff;
+ COLORREF m_clrSelDiff;
+
+ // Overrides
+ // ClassWizard generated virtual function overrides
+ //{{AFX_VIRTUAL(CPropColors)
+ protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
+ //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+
+ // Generated message map functions
+ //{{AFX_MSG(CPropColors)
+ afx_msg void OnDifferenceColor();
+ afx_msg void OnSelDifferenceColor();
+ //}}AFX_MSG
+ DECLARE_MESSAGE_MAP()
+};
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_PROPCOLORS_H__9C0A0F92_CDD6_40FE_BEFC_101B1E22FFDD__INCLUDED_)