2005-07-11 Perry

 PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
  Remove PropFilter.cpp PropFilter.h
  Add PropLineFilter.cpp PropLineFilter.h
  Src: Merge.dsp MainFrm.cpp

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 231578c..d8fd3df 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -47,7 +47,7 @@
 #include "Splash.h"
 #include "VssPrompt.h"
 #include "CCPrompt.h"
-#include "PropFilter.h"
+#include "PropLineFilter.h"
 #include "RegKey.h"
 #include "logfile.h"
 #include "ssapi.h"      // BSP - Includes for Visual Source Safe COM interface

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index 7fabf26..dfef092 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -623,7 +623,7 @@ SOURCE=.\Common\PropertyPageHost.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\PropFilter.cpp
+SOURCE=.\PropLineFilter.cpp
 # End Source File
 # Begin Source File
 
@@ -1177,7 +1177,7 @@ SOURCE=.\Common\PropertyPageHost.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\PropFilter.h
+SOURCE=.\PropLineFilter.h
 # End Source File
 # Begin Source File
 

diff --git a/Src/PropFilter.cpp b/Src/PropFilter.cpp
deleted file mode 100644 (file)
index 9435e9f..0000000
--- a/Src/PropFilter.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *  @file PropFilter.cpp
- *
- *  @brief Implementation of Line Filter dialog
- */ 
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-#include "stdafx.h"
-#include "merge.h"
-#include "PropFilter.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CPropFilter property page
-
-IMPLEMENT_DYNAMIC(CPropFilter, CPropertyPage)
-
-CPropFilter::CPropFilter()
-: CPropertyPage(CPropFilter::IDD)
-{
-       //{{AFX_DATA_INIT(CPropFilter)
-       m_bIgnoreRegExp = FALSE;
-       m_sPattern = _T("");
-       //}}AFX_DATA_INIT
-}
-
-CPropFilter::~CPropFilter()
-{
-}
-
-void CPropFilter::DoDataExchange(CDataExchange* pDX)
-{
-       CPropertyPage::DoDataExchange(pDX);
-       //{{AFX_DATA_MAP(CPropFilter)
-       DDX_Control(pDX, IDC_EDITPATTERN, m_cPattern);
-       DDX_Check(pDX, IDC_IGNOREREGEXP, m_bIgnoreRegExp);
-       DDX_Text(pDX, IDC_EDITPATTERN, m_sPattern);
-       //}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CPropFilter, CPropertyPage)
-       //{{AFX_MSG_MAP(CPropFilter)
-       ON_BN_CLICKED(IDC_IGNOREREGEXP, OnIgnoreregexp)
-       //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CPropFilter message handlers
-
-BOOL CPropFilter::OnInitDialog() 
-{
-       CPropertyPage::OnInitDialog();
-
-       m_cPattern.EnableWindow(m_bIgnoreRegExp);
-       
-       return TRUE;  // return TRUE unless you set the focus to a control
-                     // EXCEPTION: OCX Property Pages should return FALSE
-}
-
-
-/// User clicked the ignore checkbox
-void CPropFilter::OnIgnoreregexp() 
-{
-       UpdateData();
-       // enable or disable the edit box according to
-       // the value of the check box
-       m_cPattern.EnableWindow(m_bIgnoreRegExp);
-       if (m_bIgnoreRegExp)
-               m_cPattern.SetFocus();
-}

diff --git a/Src/PropFilter.h b/Src/PropFilter.h
deleted file mode 100644 (file)
index ae7a6f2..0000000
--- a/Src/PropFilter.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// PropFilter.h : header file
-//
-
-#if !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)
-#define AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_
-
-/** 
- * @file  PropFilter.h
- *
- * @brief Declaration file for Line Filter dialog
- *
- */
-// RCS ID line follows -- this is updated by CVS
-// $Id$
-
-/// Class for Line filter propertypage
-class CPropFilter : public CPropertyPage
-{
-       DECLARE_DYNAMIC(CPropFilter)
-
-// Construction
-public:
-       CPropFilter();
-       ~CPropFilter();
-
-// Dialog Data
-       //{{AFX_DATA(CPropFilter)
-       enum { IDD = IDD_PROPPAGE_FILTER };
-       CEdit   m_cPattern;
-       BOOL    m_bIgnoreRegExp;
-       CString m_sPattern;
-       //}}AFX_DATA
-
-// Implementation
-
-// Overrides
-       // ClassWizard generate virtual function overrides
-       //{{AFX_VIRTUAL(CPropFilter)
-       protected:
-       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-       //}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-       // Generated message map functions
-       //{{AFX_MSG(CPropFilter)
-       virtual BOOL OnInitDialog();
-       afx_msg void OnIgnoreregexp();
-       //}}AFX_MSG
-       DECLARE_MESSAGE_MAP()
-
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_PROPFILTER_H__73E79E13_34DD_4C86_A3EC_A1044B721CCA__INCLUDED_)

diff --git a/Src/readme.txt b/Src/readme.txt
index 43be50d..416c9ec 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2005-07-11 Perry
+ PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
+  Remove PropFilter.cpp PropFilter.h
+  Add PropLineFilter.cpp PropLineFilter.h
+  Src: Merge.dsp MainFrm.cpp
+
 2005-07-08 Tim
  PATCH: [ 1232760 ] Icon for 'Merge->Delete'
   Src: MainFrm.cpp Merge.rc resource.h