|
From: <ga...@us...> - 2007-01-10 13:44:51
|
Revision: 4022
http://svn.sourceforge.net/winmerge/?rev=4022&view=rev
Author: galh
Date: 2007-01-10 05:44:44 -0800 (Wed, 10 Jan 2007)
Log Message:
-----------
PATCH: [ 1631215 ] Remove used files
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Merge.dsp
Removed Paths:
-------------
branches/R2_6/Src/Common/listvwex.cpp
branches/R2_6/Src/Common/listvwex.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Changes.txt 2007-01-10 13:44:44 UTC (rev 4022)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-01-10 Gal
+ PATCH: [ 1631215 ] Remove used files
+ Src: Merge.dsp
+ Src/Common deleted: listvwex.cpp listvwex.h
+
2006-12-20 Kimmo
BUG: [ 1619689 ] Filefilter: ASP.NET Devel
Filters: ASPNET.flt
Deleted: branches/R2_6/Src/Common/listvwex.cpp
===================================================================
--- branches/R2_6/Src/Common/listvwex.cpp 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Common/listvwex.cpp 2007-01-10 13:44:44 UTC (rev 4022)
@@ -1,547 +0,0 @@
-// ListVwEx.cpp : implementation of the CListViewEx class
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-
-#include "stdafx.h"
-#include "ListVwEx.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx
-
-IMPLEMENT_DYNCREATE(CListViewEx, CListView)
-
-BEGIN_MESSAGE_MAP(CListViewEx, CListView)
- //{{AFX_MSG_MAP(CListViewEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx construction/destruction
-
-BOOL CListViewEx::PreCreateWindow(CREATESTRUCT& cs)
-{
- // default is report view and full row selection
- cs.style&=~LVS_TYPEMASK;
- cs.style|=LVS_REPORT | LVS_OWNERDRAWFIXED;
-
- return(CListView::PreCreateWindow(cs));
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx
-
-IMPLEMENT_DYNCREATE(CListCtrlEx, CListCtrl)
-
-BEGIN_MESSAGE_MAP(CListCtrlEx, CListCtrl)
- //{{AFX_MSG_MAP(CListCtrlEx)
- ON_WM_SIZE()
- ON_WM_PAINT()
- ON_WM_SETFOCUS()
- ON_WM_KILLFOCUS()
- //}}AFX_MSG_MAP
- ON_MESSAGE(LVM_SETIMAGELIST, OnSetImageList)
- ON_MESSAGE(LVM_SETTEXTCOLOR, OnSetTextColor)
- ON_MESSAGE(LVM_SETTEXTBKCOLOR, OnSetTextBkColor)
- ON_MESSAGE(LVM_SETBKCOLOR, OnSetBkColor)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CListCtrlEx construction/destruction
-
-CListCtrlEx::CListCtrlEx()
-#pragma warning(disable:4355) // 'this' : used in base member initializer list
-: m_listex(*this)
-#pragma warning(default:4355) // 'this' : used in base member initializer list
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx
-
-BOOL CListEx::SetFullRowSel(BOOL bFullRowSel)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // no painting during change
- ListCtrl.LockWindowUpdate();
-
- m_bFullRowSel=bFullRowSel;
-
- BOOL bRet;
-
- if(m_bFullRowSel)
- bRet=ListCtrl.ModifyStyle(0L,LVS_OWNERDRAWFIXED);
- else
- bRet=ListCtrl.ModifyStyle(LVS_OWNERDRAWFIXED,0L);
-
- // repaint window if we are not changing view type
- if(bRet && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- ListCtrl.Invalidate();
-
- // repaint changes
- ListCtrl.UnlockWindowUpdate();
-
- return(bRet);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx drawing
-
-// offsets for first and other columns
-#define OFFSET_FIRST 2
-#define OFFSET_OTHER 6
-
-void CListEx::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CDC* pDC=CDC::FromHandle(lpDrawItemStruct->hDC);
- CRect rcItem(lpDrawItemStruct->rcItem);
- UINT uiFlags=ILD_TRANSPARENT;
- CImageList* pImageList;
- int nItem=lpDrawItemStruct->itemID;
- BOOL bFocus=(ListCtrl.GetFocus()==&ListCtrl);
- COLORREF clrTextSave, clrBkSave;
- COLORREF clrImage=m_clrBkgnd;
- static _TCHAR szBuff[MAX_PATH];
- LPCTSTR pszText;
-
-// get item data
-
- LV_ITEM lvi;
- lvi.mask=LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
- lvi.iItem=nItem;
- lvi.iSubItem=0;
- lvi.pszText=szBuff;
- lvi.cchTextMax=sizeof(szBuff);
- lvi.stateMask=0xFFFF; // get all state flags
- ListCtrl.GetItem(&lvi);
-
- BOOL bSelected=(bFocus || (ListCtrl.GetStyle() & LVS_SHOWSELALWAYS)) && lvi.state & LVIS_SELECTED;
- bSelected=bSelected || (lvi.state & LVIS_DROPHILITED);
-
-// set colors if item is selected
-
- CRect rcAllLabels;
- ListCtrl.GetItemRect(nItem,rcAllLabels,LVIR_BOUNDS);
- CRect rcLabel;
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcAllLabels.left=rcLabel.left;
- if(m_bClientWidthSel && rcAllLabels.right<m_cxClient)
- rcAllLabels.right=m_cxClient;
-
- if(bSelected)
- {
- clrTextSave=pDC->SetTextColor(::GetSysColor(COLOR_HIGHLIGHTTEXT));
- clrBkSave=pDC->SetBkColor(::GetSysColor(COLOR_HIGHLIGHT));
- CBrush brush(::GetSysColor(COLOR_HIGHLIGHT));
- pDC->FillRect(rcAllLabels,&brush);
- }
- else
- {
- clrTextSave=pDC->SetTextColor(m_clrText);
- clrBkSave=pDC->SetBkColor(m_clrTextBk);
- CBrush brush(m_clrTextBk);
- pDC->FillRect(rcAllLabels,&brush);
- }
-
-// set color and mask for the icon
-
- if(lvi.state & LVIS_CUT)
- {
- clrImage=m_clrBkgnd;
- uiFlags|=ILD_BLEND50;
- }
- else if(bSelected)
- {
- clrImage=::GetSysColor(COLOR_HIGHLIGHT);
- uiFlags|=ILD_BLEND50;
- }
-
-// draw state icon
-
- UINT nStateImageMask=lvi.state & LVIS_STATEIMAGEMASK;
- if(nStateImageMask)
- {
- int nImage=(nStateImageMask>>12)-1;
- pImageList=ListCtrl.GetImageList(LVSIL_STATE);
- if(pImageList)
- pImageList->Draw(pDC,nImage,CPoint(rcItem.left,rcItem.top),ILD_TRANSPARENT);
- }
-
-// draw normal and overlay icon
-
- CRect rcIcon;
- ListCtrl.GetItemRect(nItem,rcIcon,LVIR_ICON);
-
- pImageList=ListCtrl.GetImageList(LVSIL_SMALL);
- if(pImageList)
- {
- UINT nOvlImageMask=lvi.state & LVIS_OVERLAYMASK;
- if(rcItem.left<rcItem.right-1)
- ImageList_DrawEx(pImageList->m_hImageList,lvi.iImage,pDC->m_hDC,rcIcon.left,rcIcon.top,16,16,m_clrBkgnd,clrImage,uiFlags | nOvlImageMask);
- }
-
-// draw item label
-
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_LABEL);
- rcItem.right-=m_cxStateImageOffset;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_FIRST);
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_FIRST;
- rcLabel.right-=OFFSET_FIRST;
-
- pDC->DrawText(pszText,-1,rcLabel, m_nTabFlag | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
-
-// draw labels for extra columns
-
- LV_COLUMN lvc;
- lvc.mask=LVCF_FMT | LVCF_WIDTH;
-
- for(int nColumn=1; ListCtrl.GetColumn(nColumn,&lvc); nColumn++)
- {
- rcItem.left=rcItem.right;
- rcItem.right+=lvc.cx;
-
- int nRetLen=ListCtrl.GetItemText(nItem,nColumn,szBuff,sizeof(szBuff));
- if(nRetLen==0) continue;
-
- pszText=MakeShortString(pDC,szBuff,rcItem.right-rcItem.left,2*OFFSET_OTHER);
-
- UINT nJustify=DT_LEFT;
-
- if(pszText==szBuff)
- {
- switch(lvc.fmt & LVCFMT_JUSTIFYMASK)
- {
- case LVCFMT_RIGHT:
- nJustify=DT_RIGHT;
- break;
- case LVCFMT_CENTER:
- nJustify=DT_CENTER;
- break;
- default:
- break;
- }
- }
-
- rcLabel=rcItem;
- rcLabel.left+=OFFSET_OTHER;
- rcLabel.right-=OFFSET_OTHER;
-
- pDC->DrawText(pszText,-1,rcLabel,nJustify | DT_SINGLELINE | DT_NOPREFIX | DT_NOCLIP | DT_VCENTER);
- }
-
-// draw focus rectangle if item has focus
-
- if(lvi.state & LVIS_FOCUSED && bFocus)
- pDC->DrawFocusRect(rcAllLabels);
-
-// set original colors
- pDC->SetTextColor(clrTextSave);
- pDC->SetBkColor(clrBkSave);
-}
-
-LPCTSTR CListEx::MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
-{
- static const _TCHAR szThreeDots[]=_T("...");
-
- int nStringLen=lstrlen(lpszLong);
-
- CSize ext;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(lpszLong,nStringLen, 0, NULL);
- else
- ext = pDC->GetTextExtent(lpszLong,nStringLen);
- if(nStringLen==0 || ext.cx+nOffset<=nColumnLen)
- return(lpszLong);
-
- static _TCHAR szShort[MAX_PATH];
-
- lstrcpy(szShort,lpszLong);
- int nAddLen=pDC->GetTextExtent(szThreeDots,sizeof(szThreeDots)).cx;
-
- for(int i=nStringLen-1; i>0; i--)
- {
- szShort[i]=0;
- if (m_nTabFlag == DT_EXPANDTABS)
- ext = pDC->GetTabbedTextExtent(szShort,i, 0, NULL);
- else
- ext = pDC->GetTextExtent(szShort,i);
- if(ext.cx+nOffset+nAddLen<=nColumnLen)
- break;
- }
-
- lstrcat(szShort,szThreeDots);
-
- return(szShort);
-}
-
-void CListEx::RepaintSelectedItems()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- CRect rcItem, rcLabel;
-
-// invalidate focused item so it can repaint properly
-
- int nItem=ListCtrl.GetNextItem(-1,LVNI_FOCUSED);
-
- if(nItem!=-1)
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
-
-// if selected items should not be preserved, invalidate them
-
- if(!(ListCtrl.GetStyle() & LVS_SHOWSELALWAYS))
- {
- for(nItem=ListCtrl.GetNextItem(-1,LVNI_SELECTED);
- nItem!=-1; nItem=ListCtrl.GetNextItem(nItem,LVNI_SELECTED))
- {
- ListCtrl.GetItemRect(nItem,rcItem,LVIR_BOUNDS);
- ListCtrl.GetItemRect(nItem,rcLabel,LVIR_LABEL);
- rcItem.left=rcLabel.left;
-
- ListCtrl.InvalidateRect(rcItem,FALSE);
- }
- }
-
-// update changes
-
- ListCtrl.UpdateWindow();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx diagnostics
-
-#ifdef _DEBUG
-
-void CListEx::Dump(CDumpContext& dc) const
-{
- dc << "m_bFullRowSel = " << (UINT)m_bFullRowSel;
- dc << "\n";
- dc << "m_cxStateImageOffset = " << m_cxStateImageOffset;
- dc << "\n";
-}
-
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CListViewEx message handlers
-
-// Class to allow public calls to CWnd::Default
-class WndAccess : public CWnd
-{
-protected:
- LRESULT CallWndDefault() { return CWnd::Default(); }
-public:
- static LRESULT CallDefault(CWnd * pwnd)
- {
- WndAccess * pw = (WndAccess *)pwnd;
- return pw->CallWndDefault();
- }
-};
-
-LRESULT CListEx::Default()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- return WndAccess::CallDefault(&ListCtrl);
-}
-
-LRESULT CListEx::OnSetImageList(WPARAM wParam, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- if((int)wParam==LVSIL_STATE)
- {
- int cx, cy;
-
- if(::ImageList_GetIconSize((HIMAGELIST)lParam,&cx,&cy))
- m_cxStateImageOffset=cx;
- else
- m_cxStateImageOffset=0;
- }
-
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- CListCtrl& ListCtrl=GetListCtrl();
- m_clrText=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetTextBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrTextBk=(COLORREF)lParam;
- return(Default());
-}
-
-LRESULT CListEx::OnSetBkColor(WPARAM /*wParam*/, LPARAM lParam)
-{
- m_clrBkgnd=(COLORREF)lParam;
- return(Default());
-}
-
-void CListEx::OnSize(UINT nType, int cx, int cy)
-{
- m_cxClient=cx;
-}
-
-void CListEx::OnPaint()
-{
- CListCtrl& ListCtrl=GetListCtrl();
- // in full row select mode, we need to extend the clipping region
- // so we can paint a selection all the way to the right
- if(m_bClientWidthSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT && GetFullRowSel())
- {
- CRect rcAllLabels;
- GetListCtrl().GetItemRect(0,rcAllLabels,LVIR_BOUNDS);
-
- if(rcAllLabels.right<m_cxClient)
- {
- // need to call BeginPaint (in CPaintDC c-tor)
- // to get correct clipping rect
- CPaintDC dc(&ListCtrl);
-
- CRect rcClip;
- dc.GetClipBox(rcClip);
-
- rcClip.left=min(rcAllLabels.right-1,rcClip.left);
- rcClip.right=m_cxClient;
-
- ListCtrl.InvalidateRect(rcClip,FALSE);
- // EndPaint will be called in CPaintDC d-tor
- }
- }
-}
-
-void CListEx::OnSetFocus(CWnd* pOldWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are getting focus from label edit box
- if(pOldWnd!=NULL && pOldWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-void CListEx::OnKillFocus(CWnd* pNewWnd)
-{
- CListCtrl& ListCtrl=GetListCtrl();
-
- // check if we are losing focus to label edit box
- if(pNewWnd!=NULL && pNewWnd->GetParent()==&ListCtrl)
- return;
-
- // repaint items that should change appearance
- if(m_bFullRowSel && (ListCtrl.GetStyle() & LVS_TYPEMASK)==LVS_REPORT)
- RepaintSelectedItems();
-}
-
-
-void CListEx::AddItem(int nItem,int nSubItem,LPCTSTR strItem)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_TEXT;
- lvItem.iItem = nItem;
-
- lvItem.iSubItem = nSubItem;
- lvItem.pszText = (LPTSTR)strItem;
-
- CListCtrl& lc = GetListCtrl();
- if(lvItem.iSubItem == 0)
- lc.InsertItem(&lvItem);
- else
- lc.SetItem(&lvItem);
-}
-
-
-void CListEx::SetImage(int nItem, UINT nImage)
-{
- LV_ITEM lvItem;
- lvItem.mask = LVIF_IMAGE;
- lvItem.iItem = nItem;
- lvItem.iSubItem = 0;
- lvItem.iImage = nImage;
-
- GetListCtrl().SetItem(&lvItem);
-}
-
-void CListEx::ClearSelection()
-{
- CListCtrl& ctl = GetListCtrl();
- int sel = -1;
-
- while ((sel=ctl.GetNextItem(sel, LVNI_SELECTED)) != -1)
- {
- ctl.SetItemState(sel, 0, LVIS_SELECTED);
- }
-}
-
-void CListEx::SelectItems(int nFirst, int nLast, BOOL bSelected /*=TRUE*/)
-{
- CListCtrl& ctl = GetListCtrl();
- int first = min(nFirst, nLast);
- int last = max(nFirst, nLast);
- UINT state = bSelected? LVIS_SELECTED : 0;
-
- for (int i=first; i <= last; i++)
- ctl.SetItemState(i, state, LVIS_SELECTED);
-}
-
-int CListEx::InsertColumn(int nCol, DWORD idstrColumnHeading, int nFormat /*= LVCFMT_LEFT*/, int nWidth /*= -1*/, int nSubItem /*= -1*/)
-{
- CString s;
- CListCtrl& ctl = GetListCtrl();
- s.LoadString(idstrColumnHeading);
- return ctl.InsertColumn(nCol, s, nFormat, nWidth, nSubItem);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CListEx construction/destruction
-CListEx::CListEx(CListCtrl & listctrl)
-: m_listctrl(listctrl)
-{
- m_bFullRowSel=TRUE;
- m_bClientWidthSel=TRUE;
-
- m_cxClient=0;
- m_cxStateImageOffset=0;
-
- m_clrText=::GetSysColor(COLOR_WINDOWTEXT);
- m_clrTextBk=::GetSysColor(COLOR_WINDOW);
- m_clrBkgnd=::GetSysColor(COLOR_WINDOW);
- m_nTabFlag = DT_EXPANDTABS;
-}
-
Deleted: branches/R2_6/Src/Common/listvwex.h
===================================================================
--- branches/R2_6/Src/Common/listvwex.h 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Common/listvwex.h 2007-01-10 13:44:44 UTC (rev 4022)
@@ -1,251 +0,0 @@
-// ListVwEx.h : interface of the CListViewEx class
-//
-// This class provedes a full row selection mode for the report
-// mode list view control.
-//
-// This is a part of the Microsoft Foundation Classes C++ library.
-// Copyright (C) 1992-1996 Microsoft Corporation
-// All rights reserved.
-//
-// This source code is only intended as a supplement to the
-// Microsoft Foundation Classes Reference and related
-// electronic documentation provided with the library.
-// See these sources for detailed information regarding the
-// Microsoft Foundation Classes product.
-#ifndef LISTVIEWEX_H
-#define LISTVIEWEX_H
-
-class CListEx
-{
- friend class CListViewEx;
- friend class CListCtrlEx;
-
-// Construction
-public:
- CListEx(CListCtrl & listctrl);
-
-public:
- void SetExpandTabs(BOOL bExpand) { m_nTabFlag = bExpand? DT_EXPANDTABS : 0; }
- BOOL SetFullRowSel(BOOL bFillRowSel);
- BOOL GetFullRowSel() const { return m_bFullRowSel; }
- void AddItem(int nItem,int nSubItem,LPCTSTR strItem);
- void SetImage(int nItem, UINT nImage);
-
-public:
- void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct);
-
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 );
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE);
- void ClearSelection();
- virtual ~CListEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset);
- void RepaintSelectedItems();
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam);
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam);
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam);
-
-// message map functions
-protected:
- afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnPaint();
- afx_msg void OnSetFocus(CWnd* pOldWnd);
- afx_msg void OnKillFocus(CWnd* pNewWnd);
-
- LRESULT Default();
-
-
-// Attributes
-protected:
- BOOL m_bFullRowSel;
- UINT m_nTabFlag;
-
- BOOL m_bClientWidthSel;
-
-// Implementation - client area width
- int m_cxClient;
-
-// Implementation - state icon width
- int m_cxStateImageOffset;
-
-// Implementation - list view colors
- COLORREF m_clrText;
- COLORREF m_clrTextBk;
- COLORREF m_clrBkgnd;
-
-// Implementation - MFC object bound to window
- CListCtrl & m_listctrl;
- CListCtrl & GetListCtrl() { return m_listctrl; }
-};
-
-
-#include <afxcview.h>
-
-class CListViewEx : public CListView
-{
- DECLARE_DYNCREATE(CListViewEx)
-
-// Construction
-public:
- CListViewEx() : m_listex(GetListCtrl()) { }
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListViewEx)
- public:
- virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListViewEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListView::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListViewEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListView::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListView::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListView::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListView::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-class CListCtrlEx : public CListCtrl
-{
- DECLARE_DYNCREATE(CListCtrlEx)
-
-// Construction
-public:
- CListCtrlEx();
-
-public:
- void SetExpandTabs(BOOL bExpand)
- { m_listex.SetExpandTabs(bExpand); }
- BOOL SetFullRowSel(BOOL bFillRowSel)
- { return m_listex.SetFullRowSel(bFillRowSel); }
- BOOL GetFullRowSel() const
- { return m_listex.GetFullRowSel(); }
- void AddItem(int nItem,int nSubItem, LPCTSTR strItem)
- { m_listex.AddItem(nItem, nSubItem, strItem); }
- void SetImage(int nItem, UINT nImage)
- { m_listex.SetImage(nItem, nImage); }
-
-// Overrides
-protected:
- virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
- { m_listex.DrawItem(lpDrawItemStruct); }
-
- // ClassWizard generated virtual function overrides
- //{{AFX_VIRTUAL(CListCtrlEx)
- public:
- protected:
- //}}AFX_VIRTUAL
-
-// Implementation
-public:
- int InsertColumn( int nCol, DWORD idstrColumnHeading, int nFormat = LVCFMT_LEFT, int nWidth = -1, int nSubItem = -1 )
- { return m_listex.InsertColumn(nCol, idstrColumnHeading, nFormat, nWidth, nSubItem); }
- void SelectItems(int nFirst, int nLast, BOOL bSelected = TRUE)
- { m_listex.SelectItems(nFirst, nLast, bSelected); }
- void ClearSelection()
- { m_listex.ClearSelection(); }
- virtual ~CListCtrlEx() { }
-#ifdef _DEBUG
- virtual void Dump(CDumpContext& dc) const
- { CListCtrl::Dump(dc); m_listex.Dump(dc); }
-#endif
-
-protected:
- LPCTSTR MakeShortString(CDC* pDC, LPCTSTR lpszLong, int nColumnLen, int nOffset)
- { return m_listex.MakeShortString(pDC, lpszLong, nColumnLen, nOffset); }
- void RepaintSelectedItems()
- { m_listex.RepaintSelectedItems(); }
-
-// Implementation - state icon width
- afx_msg LRESULT OnSetImageList(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetImageList(wParam, lParam); }
-
-// Implementation - list view colors
- afx_msg LRESULT OnSetTextColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextColor(wParam, lParam); }
- afx_msg LRESULT OnSetTextBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetTextBkColor(wParam, lParam); }
- afx_msg LRESULT OnSetBkColor(WPARAM wParam, LPARAM lParam)
- { return m_listex.OnSetBkColor(wParam, lParam); }
-
-// Generated message map functions
-protected:
- //{{AFX_MSG(CListCtrlEx)
- afx_msg void OnSize(UINT nType, int cx, int cy) { m_listex.OnSize(nType, cx, cy); CListCtrl::OnSize(nType, cx, cy); }
- afx_msg void OnPaint() { m_listex.OnPaint(); CListCtrl::OnPaint(); }
- afx_msg void OnSetFocus(CWnd* pOldWnd) { CListCtrl::OnSetFocus(pOldWnd); m_listex.OnSetFocus(pOldWnd); }
- afx_msg void OnKillFocus(CWnd* pNewWnd) { CListCtrl::OnKillFocus(pNewWnd); m_listex.OnKillFocus(pNewWnd); }
- //}}AFX_MSG
- DECLARE_MESSAGE_MAP()
-
-private:
- CListEx m_listex;
-};
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
Modified: branches/R2_6/Src/Merge.dsp
===================================================================
--- branches/R2_6/Src/Merge.dsp 2007-01-08 20:48:23 UTC (rev 4021)
+++ branches/R2_6/Src/Merge.dsp 2007-01-10 13:44:44 UTC (rev 4022)
@@ -461,10 +461,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.cpp
# End Source File
# Begin Source File
@@ -1205,10 +1201,6 @@
# End Source File
# Begin Source File
-SOURCE=.\Common\listvwex.h
-# End Source File
-# Begin Source File
-
SOURCE=.\LoadSaveCodepageDlg.h
# End Source File
# Begin Source File
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
