m_pCtxt->m_hDirFrame = pf->GetSafeHwnd();
m_pCtxt->m_msgUpdateStatus = MSG_STAT_UPDATE;
m_pCtxt->m_bGuessEncoding = mf->m_options.GetBool(OPT_CP_DETECT);
- m_pCtxt->m_nCompMethod = mf->m_nCompMethod;
+ m_pCtxt->m_nCompMethod = mf->m_options.GetInt(OPT_CMP_METHOD);
UpdateHeaderPath(TRUE);
UpdateHeaderPath(FALSE);
// draw the headers as active ones
m_options.InitOption(OPT_CMP_METHOD, (int)CMP_CONTENT);
m_options.InitOption(OPT_CMP_MOVED_BLOCKS, false);
- m_nCompMethod = m_options.GetInt(OPT_CMP_METHOD);
-
m_options.InitOption(OPT_CLR_DIFF, (int)RGB(239,203,5));
m_options.InitOption(OPT_CLR_SELECTED_DIFF, (int)RGB(239,119,116));
m_options.InitOption(OPT_CLR_DIFF_DELETED, (int)RGB(192, 192, 192));
m_options.SaveOption(OPT_CMP_IGNORE_CASE, compage.m_bIgnoreCase == TRUE);
m_options.SaveOption(OPT_CMP_METHOD, compage.m_compareMethod);
m_options.SaveOption(OPT_CMP_MOVED_BLOCKS, compage.m_bMovedBlocks == TRUE);
-
- m_nCompMethod = compage.m_compareMethod;
m_options.SaveOption(OPT_TAB_SIZE, (int)editor.m_nTabSize);
m_options.SaveOption(OPT_TAB_TYPE, (int)editor.m_nTabType);
BOOL m_bVssSuppressPathCheck; /**< Suppresses VSS int code asking about different path */
/*@}*/
- // This is ugly hack to workaround problem we don't have any
- // access to compare options from dirscan() (dirscan.cpp)
- // Please fixme!
- int m_nCompMethod; /**< CompareMethod : CPropCompare::BY_CONTENTS or CPropCompare::BY_DATE */
-
/**
* @name Textual labels/descriptors
* These descriptors overwrite dir/filename usually shown in headerbar
+2005-03-11 Kimmo
+ PATCH: [ 1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)
+ Src: DirDoc.cpp MainFrm.cpp MainFrm.h
+
2005-03-10 Kimmo
PATCH: [ 1160064 ] Undo for Copy All
Src: MergeDoc.cpp MergeDoc.h