feat<central_clearing_system>:基本完成下单流程开发

liuye
1 parent c22bc376
Showing 19 changed files with 1210 additions and 678 deletions
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient.vcxproj
central_clearing_system/ETradeClient.vcxproj.filters
central_clearing_system/ETradeClient/mfc_ui/GridCell.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCell.h
central_clearing_system/ETradeClient/mfc_ui/GridCellBase.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCellBase.h
central_clearing_system/ETradeClient/mfc_ui/GridCtrl.cpp
central_clearing_system/ETradeClient/mfc_ui/GridCtrl.h
central_clearing_system/ETradeClient/mfc_ui/GridDropTarget.cpp
central_clearing_system/ETradeClient/mfc_ui/GridDropTarget.h
central_clearing_system/ETradeClient/mfc_ui/InPlaceEdit.h
central_clearing_system/ETradeClient/mfc_ui/MemDC.h
central_clearing_system/ETradeClient/mfc_ui/TitleTip.h
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/pay_dlg.h
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.cpp
central_clearing_system/ETradeClient/mfc_ui/place_order_dlg.h
central_clearing_system/Resource.h
@@ -203,7 +203,7 @@ BEGIN
     CONTROL         "新中新电子读卡器",IDC_RADIO_XINZHONGXIN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,174,186,71,10
 END
  
-IDD_DIALOG_PLACE_ORDER DIALOGEX 0, 0, 338, 238
+IDD_DIALOG_PLACE_ORDER DIALOGEX 0, 0, 342, 238
 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "结算下单"
 FONT 12, "微软雅黑", 400, 0, 0x86
@@ -212,7 +212,6 @@ BEGIN
     LTEXT           "货    主",IDC_STATIC_OWNER,1,19,25,14
     EDITTEXT        IDC_EDIT_NAME,91,18,44,14,ES_MULTILINE | ES_AUTOHSCROLL
     LTEXT           "商   品",IDC_STATIC_COMM,2,33,26,12
-    EDITTEXT        IDC_EDIT_CARD,29,18,53,15,ES_MULTILINE | ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_COMM_NUM,29,36,53,15,ES_MULTILINE | ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_COMM_NAME,92,37,44,13,ES_MULTILINE | ES_AUTOHSCROLL
     LTEXT           "单   位",IDC_STATIC_UNIT,1,54,26,12
@@ -224,10 +223,29 @@ BEGIN
     EDITTEXT        IDC_EDIT_PRICE,30,70,53,15,ES_MULTILINE | ES_AUTOHSCROLL
     LTEXT           "数   量",IDC_STATIC_COUNT,92,70,30,14
     EDITTEXT        IDC_EDIT_COUNT,114,69,44,13,ES_MULTILINE | ES_AUTOHSCROLL
-    PUSHBUTTON      "去支付(&S)",IDC_BUTTON_PAY,284,10,50,14
-    LTEXT           "合计：",IDC_STATIC_HEJI,246,227,20,8
+    LTEXT           "交易金额：",IDC_STATIC_HEJI,246,227,33,8
     LTEXT           "",IDC_STATIC_TOTAL_MONEY,289,227,8,8
     LTEXT           "",IDC_STATIC_ERROR,262,67,8,8
+    LTEXT           "买    家",IDC_STATIC_BUYER,170,40,25,14
+    EDITTEXT        IDC_EDIT_BUYER_NAME,260,39,44,14,ES_MULTILINE | ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_BUYER_CARD,198,39,53,15,ES_MULTILINE | ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_CARD,29,18,53,15,ES_MULTILINE | ES_AUTOHSCROLL
+    PUSHBUTTON      "去支付(&S)",IDC_BUTTON_PAY,287,10,50,14
+    PUSHBUTTON      "买家刷卡(F11)",IDC_BUTTON_SWIP_CARD,287,53,50,14
+END
+
+IDD_DIALOG_PAY DIALOGEX 0, 0, 229, 119
+STYLE DS_SETFONT | WS_POPUP | WS_BORDER | WS_SYSMENU
+FONT 12, "微软雅黑", 400, 0, 0x0
+BEGIN
+    LTEXT           "总计金额：",IDC_PAY_STATIC_TOTAL_MONEY,18,20,41,8
+    LTEXT           "",IDC_PAY_STATIC_MONEY,73,20,8,8
+    LTEXT           "密   码：",IDC_PAY_STATIC_PASSWORD,18,50,31,8
+    EDITTEXT        IDC_PAY_EDIT_PASSWORD,56,46,40,14,ES_MULTILINE | ES_AUTOHSCROLL
+    PUSHBUTTON      "输入密码(&A)",IDC_PAY_BUTTON_PASSWORD,151,51,71,18
+    PUSHBUTTON      "关闭(&S)",IDC_PAY_BUTTON_CLOSE,155,95,67,17
+    PUSHBUTTON      "付款(&F)",IDC_PAY_BUTTON_PAY,72,95,67,17
+    LTEXT           "",IDC_PAY_STATIC_REAL_MONEY,65,20,57,8
 END
  
  
@@ -302,9 +320,18 @@ BEGIN
     IDD_DIALOG_PLACE_ORDER, DIALOG
     BEGIN
         MOCKUP, 1, 50, -25, -30, "C:\Users\WangGY\Desktop\TIM图片20180918183513.png"
-        RIGHTMARGIN, 334
+        RIGHTMARGIN, 337
         HORZGUIDE, 67
     END
+
+    IDD_DIALOG_PAY, DIALOG
+    BEGIN
+        MOCKUP, 1, 50, -5, -34, "C:\Users\WangGY\Desktop\无标题.png"
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 222
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 112
+    END
 END
 #endif    // APSTUDIO_INVOKED
  
@@ -141,6 +141,8 @@
     <ClInclude Include="ETradeClient\mfc_ui\LoginDialog.h" />
     <ClInclude Include="ETradeClient\mfc_ui\LoginEdit.h" />
     <ClInclude Include="ETradeClient\mfc_ui\MainFrm.h" />
+    <ClInclude Include="ETradeClient\mfc_ui\MemDC.h" />
+    <ClInclude Include="ETradeClient\mfc_ui\pay_dlg.h" />
     <ClInclude Include="ETradeClient\mfc_ui\place_order_dlg.h" />
     <ClInclude Include="ETradeClient\mfc_ui\PopupBrowserDlgView.h" />
     <ClInclude Include="ETradeClient\mfc_ui\ConfigDialog.h" />
@@ -190,6 +192,7 @@
     <ClCompile Include="ETradeClient\mfc_ui\LoginDialog.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\LoginEdit.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\MainFrm.cpp" />
+    <ClCompile Include="ETradeClient\mfc_ui\pay_dlg.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\place_order_dlg.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\PopupBrowserDlgView.cpp" />
     <ClCompile Include="ETradeClient\mfc_ui\ConfigDialog.cpp" />
@@ -210,6 +210,12 @@
     <ClInclude Include="ETradeClient\mfc_ui\etrade_edit_control.h">
       <Filter>Header Files\mfc_ui</Filter>
     </ClInclude>
+    <ClInclude Include="ETradeClient\mfc_ui\MemDC.h">
+      <Filter>Header Files\mfc_ui</Filter>
+    </ClInclude>
+    <ClInclude Include="ETradeClient\mfc_ui\pay_dlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -338,6 +344,9 @@
     <ClCompile Include="ETradeClient\mfc_ui\etrade_edit_control.cpp">
       <Filter>Source Files\mfc_ui</Filter>
     </ClCompile>
+    <ClCompile Include="ETradeClient\mfc_ui\pay_dlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ETradeClient.rc">
@@ -5,8 +5,8 @@
 // Provides the implementation for the "default" cell type of the
 // grid control. Adds in cell editing.
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -60,8 +60,9 @@ CGridCell::~CGridCell()
  
 /////////////////////////////////////////////////////////////////////////////
 // GridCell Attributes
-
-void CGridCell::operator=(const CGridCell& cell)
+//Used for merge cells,remove const
+//by Huang Wei
+void CGridCell::operator=( CGridCell& cell)
 {
     if (this != &cell) CGridCellBase::operator=(cell);
 }
@@ -72,7 +73,6 @@ void CGridCell::Reset()
  
     m_strText.Empty();
     m_nImage   = -1;
-    m_lParam   = NULL;           // BUG FIX J. Bloggs 20/10/03
     m_pGrid    = NULL;
     m_bEditing = FALSE;
     m_pEditWnd = NULL;
@@ -223,28 +223,9 @@ CGridDefaultCell::CGridDefaultCell()
     GetObject(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), &lf);
     SetFont(&lf);
 #else // not CE
-
     NONCLIENTMETRICS ncm;
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    ncm.cbSize = sizeof(NONCLIENTMETRICS); // NONCLIENTMETRICS has an extra element after VC6
-#else
-    // Check the operating system's version
-    OSVERSIONINFOEX osvi;
-    ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
-    if( !GetVersionEx((OSVERSIONINFO *) &osvi))
-    {
-    	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);	
-        GetVersionEx ((OSVERSIONINFO *)&osvi);
-    }
-    
-    if (osvi.dwMajorVersion > 5)
-    	ncm.cbSize = sizeof(NONCLIENTMETRICS);
-    else
-	    ncm.cbSize = sizeof(NONCLIENTMETRICS) - sizeof(ncm.iPaddedBorderWidth);
-#endif
+    ncm.cbSize = sizeof(NONCLIENTMETRICS);
     VERIFY(SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0));
-
     SetFont(&(ncm.lfMessageFont));
 #endif
 }
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - Grid cell class header file
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -48,7 +48,7 @@ public:
  
 // Attributes
 public:
-    void operator=(const CGridCell& cell);
+    void operator=( CGridCell& cell);
  
     virtual void  SetText(LPCTSTR szText)        { m_strText = szText;  }                       
     virtual void  SetImage(int nImage)           { m_nImage = nImage;   }                        
@@ -7,8 +7,8 @@
 // implementations of drawing, printingetc provided. MUST be derived
 // from to be used.
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -30,7 +30,6 @@
 // C Maunder     - 29 Aug 2000 - operator= checks for NULL font before setting (Martin Richter)
 // C Maunder     - 15 Oct 2000 - GetTextExtent fixed (Martin Richter)
 // C Maunder     -  1 Jan 2001 - Added ValidateEdit
-// Yogurt        - 13 Mar 2004 - GetCellExtent fixed
 //
 // NOTES: Each grid cell should take care of it's own drawing, though the Draw()
 //        method takes an "erase background" paramter that is called if the grid
@@ -71,10 +70,19 @@ CGridCellBase::~CGridCellBase()
  
 void CGridCellBase::Reset()
 {
+	m_Hide=false;
     m_nState  = 0;
+	m_MergeRange.Set();
+	m_IsMergeWithOthers=false;
+	m_MergeCellID.row=-1;
+	m_MergeCellID.col=-1;
+
+
 }
+//Used for merge cells,remove const
+//by Huang Wei
  
-void CGridCellBase::operator=(const CGridCellBase& cell)
+void CGridCellBase::operator=( CGridCellBase& cell)
 {
 	if (this == &cell) return;
  
@@ -89,6 +97,11 @@ void CGridCellBase::operator=(const CGridCellBase&amp; cell)
     SetBackClr(cell.GetBackClr());
     SetFont(cell.IsDefaultFont()? NULL : cell.GetFont());
     SetMargin(cell.GetMargin());
+//Used for merge cells
+//by Huang Wei
+	SetMergeCellID(cell.GetMergeCellID());
+	SetMergeRange(cell.GetMergeRange());
+	Show(cell.IsShow());
 }
  
 /////////////////////////////////////////////////////////////////////////////
@@ -115,6 +128,14 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
     // Note - all through this function we totally brutalise 'rect'. Do not
     // depend on it's value being that which was passed in.
  
+	//Used for merge cells
+	//by Huang Wei
+	if(	m_Hide && !IsMerged())
+	{
+		return TRUE;
+	}
+
+
     CGridCtrl* pGrid = GetGrid();
     ASSERT(pGrid);
  
@@ -206,7 +227,7 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
             rect.bottom--;
         }
  
-		//rect.DeflateRect(0,1,1,1);  - Removed by Yogurt
+		rect.DeflateRect(0,1,1,1); 
     }
     else if ((GetState() & GVIS_SELECTED))
     {
@@ -277,10 +298,7 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
             pDC->SelectObject(pFont);
     }
  
-    //rect.DeflateRect(GetMargin(), 0); - changed by Yogurt
-    rect.DeflateRect(GetMargin(), GetMargin());    
-    rect.right++;    
-    rect.bottom++;
+    rect.DeflateRect(GetMargin(), 0);
  
     if (pGrid->GetImageList() && GetImage() >= 0)
     {
@@ -296,21 +314,14 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
             // pDC->SelectClipRgn(&rgn);
             // rgn.DeleteObject();
  
-            /*
-            // removed by Yogurt
             int nImageWidth = Info.rcImage.right-Info.rcImage.left+1;
             int nImageHeight = Info.rcImage.bottom-Info.rcImage.top+1;
+
             if( nImageWidth + rect.left <= rect.right + (int)(2*GetMargin())
                 && nImageHeight + rect.top <= rect.bottom + (int)(2*GetMargin())  )
             {
                 pGrid->GetImageList()->Draw(pDC, GetImage(), rect.TopLeft(), ILD_NORMAL);
             }
-            */
-            // Added by Yogurt
-            int nImageWidth = Info.rcImage.right-Info.rcImage.left;            
-            int nImageHeight = Info.rcImage.bottom-Info.rcImage.top;            
-            if ((nImageWidth + rect.left <= rect.right) && (nImageHeight + rect.top <= rect.bottom))                
-                pGrid->GetImageList()->Draw(pDC, GetImage(), rect.TopLeft(), ILD_NORMAL);
  
             //rect.left += nImageWidth+GetMargin();
         }
@@ -336,8 +347,7 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
         BOOL bVertical = (GetFont()->lfEscapement == 900);
  
         // Only draw if it'll fit!
-        //if (size.cx + rect.left < rect.right + (int)(2*GetMargin())) - changed / Yogurt
-        if (size.cx + rect.left < rect.right)
+        if (size.cx + rect.left < rect.right + (int)(2*GetMargin()))
         {
             int nTriangleBase = rect.bottom - nOffset - size.cy;    // Triangle bottom right
             //int nTriangleBase = (rect.top + rect.bottom - size.cy)/2; // Triangle middle right
@@ -395,9 +405,6 @@ BOOL CGridCellBase::Draw(CDC* pDC, int nRow, int nCol, CRect rect,  BOOL bEraseB
  
     // We want to see '&' characters so use DT_NOPREFIX
     GetTextRect(rect);
-    rect.right++;    
-    rect.bottom++;
-
     DrawText(pDC->m_hDC, GetText(), -1, rect, GetFormat() | DT_NOPREFIX);
  
     pDC->RestoreDC(nSavedDC);
@@ -547,17 +554,16 @@ CSize CGridCellBase::GetTextExtent(LPCTSTR szText, CDC* pDC /*= NULL*/)
         size = rect.Size();
     }
     else
-        size = pDC->GetTextExtent(szText, (int)_tcslen(szText));
+        size = pDC->GetTextExtent(szText, _tcslen(szText));
  
-    // Removed by Yogurt
-    //TEXTMETRIC tm;
-    //pDC->GetTextMetrics(&tm);
-    //size.cx += (tm.tmOverhang);
+    TEXTMETRIC tm;
+    pDC->GetTextMetrics(&tm);
+    size.cx += (tm.tmOverhang);
  
     if (pOldFont)
         pDC->SelectObject(pOldFont);
  
-    size += CSize(2*GetMargin(), 2*GetMargin());
+    size += CSize(4*GetMargin(), 2*GetMargin());
  
     // Kludge for vertical text
     LOGFONT *pLF = GetFont();
@@ -575,41 +581,40 @@ CSize CGridCellBase::GetTextExtent(LPCTSTR szText, CDC* pDC /*= NULL*/)
     return size;
 }
  
-
 CSize CGridCellBase::GetCellExtent(CDC* pDC)
-{    
-    CSize size = GetTextExtent(GetText(), pDC);    
-    CSize ImageSize(0,0);    
+{
+    CSize size = GetTextExtent(GetText(), pDC);
+    CSize ImageSize(0,0);
+
+    int nImage = GetImage();
+    if (nImage >= 0) 
+    {
+        CGridCtrl* pGrid = GetGrid();
+        ASSERT(pGrid);
+
+        if (pGrid->GetImageList()) 
+        {
+            IMAGEINFO Info;
+            if (pGrid->GetImageList()->GetImageInfo(nImage, &Info))
+                ImageSize = CSize(Info.rcImage.right-Info.rcImage.left+1, 
+                                  Info.rcImage.bottom-Info.rcImage.top+1);
+        }
+    }
  
-    int nImage = GetImage();    
-    if (nImage >= 0)    
-    {        
-        CGridCtrl* pGrid = GetGrid();        
-        ASSERT(pGrid);        
-        IMAGEINFO Info;        
-        if (pGrid->GetImageList() && pGrid->GetImageList()->GetImageInfo(nImage, &Info))         
-        {            
-            ImageSize = CSize(Info.rcImage.right-Info.rcImage.left,                                 
-                Info.rcImage.bottom-Info.rcImage.top);            
-            if (size.cx > 2*(int)GetMargin ())                
-                ImageSize.cx += GetMargin();            
-            ImageSize.cy += 2*(int)GetMargin ();        
-        }    
-    }    
-    size.cx += ImageSize.cx + 1;    
-    size.cy = max(size.cy, ImageSize.cy) + 1;    
-    if (IsFixed())    
-    {        
-        size.cx++;        
-        size.cy++;    
-    }    
-    return size;
+    return CSize(size.cx + ImageSize.cx, max(size.cy, ImageSize.cy));
 }
  
 // EFW - Added to print cells so that grids that use different colors are
 // printed correctly.
 BOOL CGridCellBase::PrintCell(CDC* pDC, int /*nRow*/, int /*nCol*/, CRect rect)
 {
+	//Used for merge cells
+	//by Huang Wei
+	if(	m_Hide && !IsMerged())
+	{
+		return TRUE;
+	}
+
 #if defined(_WIN32_WCE_NO_PRINTING) || defined(GRIDCONTROL_NO_PRINTING)
     return FALSE;
 #else
@@ -627,6 +632,11 @@ BOOL CGridCellBase::PrintCell(CDC* pDC, int /*nRow*/, int /*nCol*/, CRect rect)
     int nSavedDC = pDC->SaveDC();
  
     pDC->SetBkMode(TRANSPARENT);
+	//Used for merge cells
+	//by Huang Wei
+	rect.InflateRect(1,1);
+	pDC->Rectangle(rect);
+	rect.DeflateRect(1,1);
  
     if (pGrid->GetShadedPrintOut())
     {
@@ -729,6 +739,11 @@ BOOL CGridCellBase::PrintCell(CDC* pDC, int /*nRow*/, int /*nCol*/, CRect rect)
         rect.DeflateRect(1,1);
         pDC->SelectObject(pOldPen);
     }
+	else
+	{
+//		pDC->Rectangle(rect);
+
+	}
  
     rect.DeflateRect(GetMargin(), 0);
  
@@ -751,6 +766,7 @@ BOOL CGridCellBase::PrintCell(CDC* pDC, int /*nRow*/, int /*nCol*/, CRect rect)
  
     // Draw without clipping so as not to lose text when printed for real
 	// DT_NOCLIP removed 01.01.01. Slower, but who cares - we are printing!
+
     DrawText(pDC->m_hDC, GetText(), -1, rect,
         GetFormat() | /*DT_NOCLIP | */ DT_NOPREFIX);
  
@@ -770,4 +786,67 @@ LRESULT CGridCellBase::SendMessageToParent(int nRow, int nCol, int nMessage)
         return pGrid->SendMessageToParent(nRow, nCol, nMessage);
     else
         return 0;
-}
 \ No newline at end of file
+}
+//Used for merge cells
+//by Huang Wei
+void CGridCellBase::Show(bool IsShow)
+{
+	m_Hide=!IsShow;
+}
+//Used for merge cells
+//by Huang Wei
+void CGridCellBase::SetMergeRange(CCellRange range)
+{
+	m_MergeRange=range;
+}
+//Used for merge cells
+//by Huang Wei
+CCellRange CGridCellBase::GetMergeRange()
+{
+	return m_MergeRange;
+}
+//Used for merge cells
+//by Huang Wei
+bool CGridCellBase::IsMerged()
+{
+	return m_MergeRange.Count()>1;
+}
+//Used for merge cells
+//by Huang Wei
+void CGridCellBase::SetMergeCellID(CCellID cell)
+{
+	m_MergeCellID=cell;
+	if(cell.row!=-1)
+		m_IsMergeWithOthers=true;
+	else
+		m_IsMergeWithOthers=false;
+
+}
+//Used for merge cells
+//by Huang Wei
+CCellID CGridCellBase::GetMergeCellID()
+{
+	return m_MergeCellID;
+}
+//Used for merge cells
+//by Huang Wei
+bool CGridCellBase::IsMergeWithOthers()
+{
+	return m_IsMergeWithOthers;
+}
+//Used for merge cells
+//by Huang Wei
+bool CGridCellBase::IsShow()
+{
+	return !m_Hide;
+}
+//Used for merge cells
+//by Huang Wei
+void CGridCellBase::UnMerge()
+{
+	m_Hide=false;
+	m_MergeRange.Set();
+	m_IsMergeWithOthers=false;
+	m_MergeCellID.row=-1;
+	m_MergeCellID.col=-1;
+}
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - Grid cell base class header file
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -25,6 +25,7 @@
 #if !defined(AFX_GRIDCELLBASE_H__519FA702_722C_11D1_ABBA_00A0243D1382__INCLUDED_)
 #define AFX_GRIDCELLBASE_H__519FA702_722C_11D1_ABBA_00A0243D1382__INCLUDED_
  
+#include "CellRange.h"	// Added by ClassView
 #if _MSC_VER >= 1000
 #pragma once
 #endif // _MSC_VER >= 1000
@@ -127,10 +128,13 @@ public:
  
 // Operators
 public:
-    virtual void operator=(const CGridCellBase& cell);
+    virtual void operator=( CGridCellBase& cell);
  
 // Operations
 public:
+	bool IsMerged();
+	void SetMergeRange(CCellRange range);
+	void Show(bool IsShow);
     virtual void Reset();
  
     virtual BOOL Draw(CDC* pDC, int nRow, int nCol, CRect rect, BOOL bEraseBkgnd = TRUE);
@@ -162,8 +166,20 @@ protected:
     virtual void OnDblClick( CPoint PointCellRelative);
     virtual BOOL OnSetCursor();
  
+public:
+	void UnMerge();
+	virtual bool IsShow() ;
+	virtual CCellRange GetMergeRange();
+	virtual bool IsMergeWithOthers();
+	virtual CCellID GetMergeCellID();
+	virtual void SetMergeCellID(CCellID cell);
 protected:
     DWORD    m_nState;      // Cell state (selected/focus etc)
+private:
+	CCellRange m_MergeRange;
+	bool m_IsMergeWithOthers;
+	CCellID m_MergeCellID;
+	bool m_Hide;
 };
  
 //{{AFX_INSERT_LOCATION}}
 // GridCtrl.cpp : implementation file
 //
-// MFC Grid Control v2.26
+// MFC Grid Control v2.24
+//
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
-/
 // The code contained in this file was based on the original
 // WorldCom Grid control written by Joe Willcoxson,
 //        mailto:chinajoe@aol.com
@@ -94,25 +94,18 @@
 //                          - WS_EX_CLIENTEDGE style now implicit
 //
 //                          [ Only the latest version and major version changes will be shown ]
-////
-//          2.25       13 Mar 2004 - Chris Maunder
-//                                 - Minor changes so it will compile in VS.NET (inc. Whidbey)
-//                                 - Fixed minor bug in EnsureVisible - Junlin Xu
-//                                 - Changed AfxGetInstanceHandle for AfxGetResourceHandle in RegisterWindowClass
-//					               - Various changes thanks to Yogurt
 //
-//          2.26       13 Dec 2005 - Pierre Couderc
-//                                 - Added sort in Virtual mode
-//                                 - Change row/column order programatically or via drag and drop
-//                                 - Added save/restore layer (for undoing row/column order changes)
+//          2.24       13 Jul 2002 - Chris Maunder
+//                          - Optimised OnDraw for invisible cells.
 //
 // TODO:   1) Implement sparse grids (super easy now)
 //         2) Fix it so that as you drag select, the speed of selection increases
 //            with time.
 //         3) Scrolling is still a little dodgy (too much grey area). I know there
 //            is a simple fix but it's been a low priority
+//         4) Get some sleep
 //
-// ISSUES: 1) WindowFromPoint seems to do weird things in W2K. Causing problems for
+// ISSUES: 2) WindowFromPoint seems to do weird things in W2K. Causing problems for
 //            the rigt-click-on-titletip code.
 //
 /////////////////////////////////////////////////////////////////////////////
@@ -120,7 +113,6 @@
 #include "stdafx.h"
 #include "MemDC.h"
 #include "GridCtrl.h"
-#include <algorithm>
  
 // OLE stuff for clipboard operations
 #include <afxadv.h>            // For CSharedFile
@@ -215,7 +207,6 @@ CGridCtrl::CGridCtrl(int nRows, int nCols, int nFixedRows, int nFixedCols)
     m_nCols               = 0;
     m_nFixedRows          = 0;
     m_nFixedCols          = 0;
-	m_InDestructor        = false;
  
     m_bVirtualMode        = FALSE;
     m_pfnCallback         = NULL;
@@ -259,7 +250,7 @@ CGridCtrl::CGridCtrl(int nRows, int nCols, int nFixedRows, int nFixedCols)
     m_bAscending          = TRUE;       // sorting stuff
     m_nSortColumn         = -1;
 	m_pfnCompare		  = NULL;
-	m_pfnVirtualCompare   = NULL;
+
     m_nAutoSizeColumnStyle = GVS_BOTH;  // Autosize grid using header and data info
  
     m_nTimerID            = 0;          // For drag-selection
@@ -271,10 +262,7 @@ CGridCtrl::CGridCtrl(int nRows, int nCols, int nFixedRows, int nFixedCols)
     m_bAllowDragAndDrop   = FALSE;      // for drag and drop - EFW - off by default
     m_bTrackFocusCell     = TRUE;       // Track Focus cell?
     m_bFrameFocus         = TRUE;       // Frame the selected cell?
-	m_AllowReorderColumn	= false;
-	m_QuitFocusOnTab = false;
-	m_AllowSelectRowInFixedCol = false;
-	m_bDragRowMode = TRUE; // allow to drop a line over another one to change row order
+
     m_pRtcDefault = RUNTIME_CLASS(CGridCell);
  
     SetupDefaultCells();
@@ -303,7 +291,6 @@ CGridCtrl::CGridCtrl(int nRows, int nCols, int nFixedRows, int nFixedCols)
  
 CGridCtrl::~CGridCtrl()
 {
-	m_InDestructor = true;
     DeleteAllItems();
  
 #ifndef GRIDCONTROL_NO_TITLETIPS
@@ -325,8 +312,8 @@ CGridCtrl::~CGridCtrl()
 BOOL CGridCtrl::RegisterWindowClass()
 {
     WNDCLASS wndcls;
-    //HINSTANCE hInst = AfxGetInstanceHandle();
-    HINSTANCE hInst = AfxGetResourceHandle();
+    HINSTANCE hInst = AfxGetInstanceHandle();
+    //HINSTANCE hInst = AfxGetResourceHandle();
  
     if (!(::GetClassInfo(hInst, GRIDCTRL_CLASSNAME, &wndcls)))
     {
@@ -429,9 +416,6 @@ BOOL CGridCtrl::Create(const RECT&amp; rect, CWnd* pParentWnd, UINT nID, DWORD dwSty
     return TRUE;
 }
  
-
-
-
 void CGridCtrl::SetupDefaultCells()
 {
     m_cellDefault.SetGrid(this);            // Normal editable cell
@@ -523,42 +507,6 @@ LRESULT CGridCtrl::SendCacheHintToParent(const CCellRange&amp; range) const
         return 0;
 }
  
-#define LAYER_SIGNATURE (0x5FD4E64)
-int CGridCtrl::GetLayer(int** pLayer) // used to save and restore order of columns
-{ //  gives back the size of the area (do not forget to delete pLayer)
-	int Length = 2+GetColumnCount()*2;
-	int *Layer = new int[Length];	// the caller is supposed to delete it
-	Layer[0]= LAYER_SIGNATURE;
-	Layer[1]= GetColumnCount();
-	memcpy(&Layer[2], &m_arColOrder[0], GetColumnCount()*sizeof(int));
-	memcpy(&Layer[2+GetColumnCount()], &m_arColWidths[0], GetColumnCount()*sizeof(int));
-	*pLayer = Layer;
-	return Length;
-}
-void CGridCtrl::SetLayer(int* pLayer)
-{ // coming from a previous GetLayer (ignored if not same number of column, or the same revision number)
-	if(pLayer[0] != LAYER_SIGNATURE) return;
-	if(pLayer[1] != GetColumnCount()) return;
-/*	TRACE("  %d == %d \n",m_arColOrder[0],pLayer[2]);
-	TRACE("  %d == %d \n",m_arColOrder[1],pLayer[3]);
-	TRACE("  %d == %d \n",m_arColOrder[2],pLayer[4]);
-	TRACE("  %d == %d \n",m_arColWidths[0],pLayer[2+3]);
-	TRACE("  %d == %d \n",m_arColWidths[1],pLayer[3+3]);
-	TRACE("  %d == %d \n",m_arColWidths[2],pLayer[4+3]);
-	TRACE("  %d == %d \n",GetColumnCount(),3);
-
-	
-	ASSERT(m_arColOrder[0]==pLayer[2]);
-	ASSERT(m_arColOrder[1]==pLayer[3]);
-	ASSERT(m_arColOrder[2]==pLayer[4]);
-	ASSERT(m_arColWidths[0]==pLayer[2+3]);
-	ASSERT(m_arColWidths[1]==pLayer[3+3]);
-	ASSERT(m_arColWidths[2]==pLayer[4+3]);
-	ASSERT(GetColumnCount()==3);
-*/	memcpy(&m_arColOrder[0],&pLayer[2], GetColumnCount()*sizeof(int));
-	memcpy(&m_arColWidths[0],&pLayer[2+GetColumnCount()], GetColumnCount()*sizeof(int));
-}
-
 BEGIN_MESSAGE_MAP(CGridCtrl, CWnd)
 //EFW - Added ON_WM_RBUTTONUP
 //{{AFX_MSG_MAP(CGridCtrl)
@@ -672,8 +620,8 @@ void CGridCtrl::EraseBkgnd(CDC* pDC)
     // Draw non-fixed cell background
     if (rect.IntersectRect(VisRect, ClipRect)) 
     {
-        CRect CellRect(__max(nFixedColumnWidth, rect.left), 
-                       __max(nFixedRowHeight, rect.top),
+        CRect CellRect(max(nFixedColumnWidth, rect.left), 
+                       max(nFixedRowHeight, rect.top),
                        rect.right, rect.bottom);
         pDC->FillRect(CellRect, &TextBack);
     }
@@ -910,6 +858,7 @@ void CGridCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
         CWnd::OnKeyDown(nChar, nRepCnt, nFlags);
         return;
     }
+
     CCellID next = m_idCurrentCell;
     BOOL bChangeLine = FALSE;
 	BOOL bHorzScrollAction = FALSE;
@@ -922,10 +871,6 @@ void CGridCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
         case 'A':
             OnEditSelectAll();
             break;
-        case 'k':		// This is ctrl+ on french keyboard, may need to be better processed for other locales
-            AutoSizeColumns();
-			Invalidate();
-            break;
 #ifndef GRIDCONTROL_NO_CLIPBOARD
         case 'X':
             OnEditCut();
@@ -991,13 +936,6 @@ void CGridCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
     }
     else if (nChar == VK_RIGHT || (nChar == VK_TAB && !IsSHIFTpressed()) )
     {
-		if( (nChar == VK_TAB) &&  m_QuitFocusOnTab )
-		{
-			CDialog* p= (CDialog*) GetParent();
-			if(p) p->NextDlgCtrl();
-			return;
-
-		}
         // don't let user go to a hidden column
         bFoundVisible = FALSE;
         iOrig = next.col;
@@ -1317,7 +1255,7 @@ LRESULT CGridCtrl::OnImeChar(WPARAM wCharCode, LPARAM)
 {
     // EFW - BUG FIX
     if (!IsCTRLpressed() && m_MouseMode == MOUSE_NOTHING && wCharCode != VK_ESCAPE) 
-        OnEditCell(m_idCurrentCell.row, m_idCurrentCell.col, CPoint( -1, -1), (UINT)wCharCode);
+        OnEditCell(m_idCurrentCell.row, m_idCurrentCell.col, CPoint( -1, -1), wCharCode);
     return 0;
 }
  
@@ -1347,8 +1285,8 @@ void CGridCtrl::OnEndInPlaceEdit(NMHDR* pNMHDR, LRESULT* pResult)
     case VK_PRIOR:
     case VK_HOME:
     case VK_END:
-        OnKeyDown((UINT)pgvItem->lParam, 0, 0);
-        OnEditCell(m_idCurrentCell.row, m_idCurrentCell.col, CPoint( -1, -1), (UINT)pgvItem->lParam);
+        OnKeyDown(pgvItem->lParam, 0, 0);
+        OnEditCell(m_idCurrentCell.row, m_idCurrentCell.col, CPoint( -1, -1), pgvItem->lParam);
     }
  
     *pResult = 0;
@@ -1406,7 +1344,7 @@ void CGridCtrl::OnHScroll(UINT nSBCode, UINT /*nPos*/, CScrollBar* /*pScrollBar*
             }
  
             int xScroll = GetColumnWidth(iColToUse);
-            SetScrollPos32(SB_HORZ, __max(0, scrollPos - xScroll));
+            SetScrollPos32(SB_HORZ, max(0, scrollPos - xScroll));
             rect.left = GetFixedColumnWidth();
             //ScrollWindow(xScroll, 0, rect);
             //rect.right = rect.left + xScroll;
@@ -1431,7 +1369,7 @@ void CGridCtrl::OnHScroll(UINT nSBCode, UINT /*nPos*/, CScrollBar* /*pScrollBar*
         {
             rect.left = GetFixedColumnWidth();
             int offset = -rect.Width();
-            int pos = __max(0, scrollPos + offset);
+            int pos = max(0, scrollPos + offset);
             SetScrollPos32(SB_HORZ, pos);
             rect.left = GetFixedColumnWidth();
             InvalidateRect(rect);
@@ -1528,7 +1466,7 @@ void CGridCtrl::OnVScroll(UINT nSBCode, UINT /*nPos*/, CScrollBar* /*pScrollBar*
             }
  
             int yScroll = GetRowHeight( iRowToUse);
-            SetScrollPos32(SB_VERT, __max(0, scrollPos - yScroll));
+            SetScrollPos32(SB_VERT, max(0, scrollPos - yScroll));
             rect.top = GetFixedRowHeight();
             //ScrollWindow(0, yScroll, rect);
             //rect.bottom = rect.top + yScroll;
@@ -1552,7 +1490,7 @@ void CGridCtrl::OnVScroll(UINT nSBCode, UINT /*nPos*/, CScrollBar* /*pScrollBar*
         {
             rect.top = GetFixedRowHeight();
             int offset = -rect.Height();
-            int pos = __max(0, scrollPos + offset);
+            int pos = max(0, scrollPos + offset);
             SetScrollPos32(SB_VERT, pos);
             rect.top = GetFixedRowHeight();
             InvalidateRect(rect);
@@ -1632,28 +1570,106 @@ void CGridCtrl::OnDraw(CDC* pDC)
     if (GetVirtualMode())
         SendCacheHintToParent(VisCellRange);
  
-    // draw top-left cells 0..m_nFixedRows-1, 0..m_nFixedCols-1
-    rect.bottom = -1;
-    for (row = 0; row < m_nFixedRows; row++)
+    CPen pen;
+    pen.CreatePen(PS_SOLID, 0, m_crGridLineColour);
+    pDC->SelectObject(&pen);
+
+    // draw vertical lines (drawn at ends of cells)
+    if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
+    {
+        int x = nFixedColWidth;
+        for (col = minVisibleCol; col <= maxVisibleCol; col++)
+        {
+            if (GetColumnWidth(col) <= 0) continue;
+
+            x += GetColumnWidth(col);
+            pDC->MoveTo(x-1, nFixedRowHeight);
+            pDC->LineTo(x-1, VisRect.bottom);
+        }
+    }
+
+    // draw horizontal lines (drawn at bottom of each cell)
+    if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
+    {
+        int y = nFixedRowHeight;
+        for (row = minVisibleRow; row <= maxVisibleRow; row++)
+        {
+            if (GetRowHeight(row) <= 0) continue;
+
+            y += GetRowHeight(row);
+            pDC->MoveTo(nFixedColWidth, y-1);
+            pDC->LineTo(VisRect.right,  y-1);
+        }
+    }
+
+    pDC->SelectStockObject(NULL_PEN);
+
+    // draw rest of non-fixed cells
+    rect.bottom = nFixedRowHeight-1;
+    for (row = minVisibleRow; row <= maxVisibleRow; row++)
     {
         if (GetRowHeight(row) <= 0) continue;
  
         rect.top = rect.bottom+1;
         rect.bottom = rect.top + GetRowHeight(row)-1;
-        rect.right = -1;
  
-        for (col = 0; col < m_nFixedCols; col++)
+        // rect.bottom = bottom pixel of previous row
+        if (rect.top > clipRect.bottom)
+            break;                // Gone past cliprect
+        if (rect.bottom < clipRect.top)
+            continue;             // Reached cliprect yet?
+
+        rect.right = nFixedColWidth-1;
+        for (col = minVisibleCol; col <= maxVisibleCol; col++)
         {
             if (GetColumnWidth(col) <= 0) continue;
  
             rect.left = rect.right+1;
             rect.right = rect.left + GetColumnWidth(col)-1;
  
+            if (rect.left > clipRect.right)
+                break;        // gone past cliprect
+            if (rect.right < clipRect.left)
+                continue;     // Reached cliprect yet?
+
             pCell = GetCell(row, col);
+		
+            // TRACE(_T("Cell %d,%d type: %s\n"), row, col, pCell->GetRuntimeClass()->m_lpszClassName);
             if (pCell)
 			{
-				pCell->SetCoords(row,col);
-                pCell->Draw(pDC, row, col, rect, FALSE);
+				//Used for merge cells
+				//by Huang Wei
+
+				if(!pCell->IsMerged())
+				{
+					if(!pCell->IsMergeWithOthers())
+					{
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, rect, FALSE);
+					}
+					else
+					{
+						CGridCellBase* pMergedCell=GetCell(pCell->GetMergeCellID());
+						CRect mergerect=rect;
+						if(GetCellRangeRect(pMergedCell->m_MergeRange,&mergerect))
+						{
+							mergerect.DeflateRect(0,0,1,1);
+							pMergedCell->SetCoords(pCell->GetMergeCellID().row,pCell->GetMergeCellID().col);
+							pMergedCell->Draw(pDC, pCell->GetMergeCellID().row,pCell->GetMergeCellID().col, mergerect, TRUE);
+						}
+					}
+				}
+				else
+				{
+					CRect mergerect=rect;
+
+					if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+					{
+						mergerect.DeflateRect(0,0,1,1);
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, mergerect, TRUE);
+					}
+				}
 			}
         }
     }
@@ -1687,10 +1703,46 @@ void CGridCtrl::OnDraw(CDC* pDC)
                 continue;         // Reached cliprect yet?
  
             pCell = GetCell(row, col);
+   //         if (pCell)
+			//{
+			//	pCell->SetCoords(row,col);
+   //             pCell->Draw(pDC, row, col, rect, TRUE);
+			//}
             if (pCell)
 			{
-				pCell->SetCoords(row,col);
-                pCell->Draw(pDC, row, col, rect, FALSE);
+				//Used for merge cells
+				//by Huang Wei
+
+				if(!pCell->IsMerged())
+				{
+					if(!pCell->IsMergeWithOthers())
+					{
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, rect, FALSE);
+					}
+					else
+					{
+						CGridCellBase* pMergedCell=GetCell(pCell->GetMergeCellID());
+						CRect mergerect=rect;
+						if(GetCellRangeRect(pMergedCell->m_MergeRange,&mergerect))
+						{
+							mergerect.DeflateRect(0,0,1,1);
+							pMergedCell->SetCoords(pCell->GetMergeCellID().row,pCell->GetMergeCellID().col);
+							pMergedCell->Draw(pDC, pCell->GetMergeCellID().row,pCell->GetMergeCellID().col, mergerect, TRUE);
+						}
+					}
+				}
+				else
+				{
+					CRect mergerect=rect;
+
+					if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+					{
+						mergerect.DeflateRect(0,0,1,1);
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, mergerect, TRUE);
+					}
+				}
 			}
         }
     }
@@ -1724,44 +1776,70 @@ void CGridCtrl::OnDraw(CDC* pDC)
                 continue;     // Reached cliprect yet?
  
             pCell = GetCell(row, col);
+   //         if (pCell)
+			//{
+			//	pCell->SetCoords(row,col);
+   //             pCell->Draw(pDC, row, col, rect, TRUE);
+			//}
             if (pCell)
 			{
-				pCell->SetCoords(row,col);
-                pCell->Draw(pDC, row, col, rect, FALSE);
+				//Used for merge cells
+				//by Huang Wei
+
+				if(!pCell->IsMerged())
+				{
+					if(!pCell->IsMergeWithOthers())
+					{
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, rect, FALSE);
+					}
+					else
+					{
+						CGridCellBase* pMergedCell=GetCell(pCell->GetMergeCellID());
+						CRect mergerect=rect;
+						if(GetCellRangeRect(pMergedCell->m_MergeRange,&mergerect))
+						{
+							mergerect.DeflateRect(0,0,1,1);
+							pMergedCell->SetCoords(pCell->GetMergeCellID().row,pCell->GetMergeCellID().col);
+							pMergedCell->Draw(pDC, pCell->GetMergeCellID().row,pCell->GetMergeCellID().col, mergerect, TRUE);
+						}
+					}
+				}
+				else
+				{
+					CRect mergerect=rect;
+
+					if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+					{
+						mergerect.DeflateRect(0,0,1,1);
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, mergerect, TRUE);
+					}
+				}
 			}
         }
     }
  
-    // draw rest of non-fixed cells
-    rect.bottom = nFixedRowHeight-1;
-    for (row = minVisibleRow; row <= maxVisibleRow; row++)
+
+/*
+    // draw top-left cells 0..m_nFixedRows-1, 0..m_nFixedCols-1
+    rect.bottom = -1;
+    for (row = 0; row < m_nFixedRows; row++)
     {
         if (GetRowHeight(row) <= 0) continue;
  
         rect.top = rect.bottom+1;
         rect.bottom = rect.top + GetRowHeight(row)-1;
+        rect.right = -1;
  
-        // rect.bottom = bottom pixel of previous row
-        if (rect.top > clipRect.bottom)
-            break;                // Gone past cliprect
-        if (rect.bottom < clipRect.top)
-            continue;             // Reached cliprect yet?
-
-        rect.right = nFixedColWidth-1;
-        for (col = minVisibleCol; col <= maxVisibleCol; col++)
+        for (col = 0; col < m_nFixedCols; col++)
         {
             if (GetColumnWidth(col) <= 0) continue;
  
             rect.left = rect.right+1;
             rect.right = rect.left + GetColumnWidth(col)-1;
  
-            if (rect.left > clipRect.right)
-                break;        // gone past cliprect
-            if (rect.right < clipRect.left)
-                continue;     // Reached cliprect yet?
-
             pCell = GetCell(row, col);
-            // TRACE(_T("Cell %d,%d type: %s\n"), row, col, pCell->GetRuntimeClass()->m_lpszClassName);
             if (pCell)
 			{
 				pCell->SetCoords(row,col);
@@ -1769,41 +1847,70 @@ void CGridCtrl::OnDraw(CDC* pDC)
 			}
         }
     }
+*/
  
  
-    CPen pen;
-    pen.CreatePen(PS_SOLID, 0, m_crGridLineColour);
-    pDC->SelectObject(&pen);
-
-    // draw vertical lines (drawn at ends of cells)
-    if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
-    {
-        int x = nFixedColWidth;
-        for (col = minVisibleCol; col <= maxVisibleCol; col++)
-        {
-            if (GetColumnWidth(col) <= 0) continue;
+	// draw top-left cells 0..m_nFixedRows-1, 0..m_nFixedCols-1
+	rect.bottom = -1;
+	for (row = 0; row < m_nFixedRows; row++)
+	{
+		if (GetRowHeight(row) <= 0) continue;
  
-            x += GetColumnWidth(col);
-            pDC->MoveTo(x-1, nFixedRowHeight);
-            pDC->LineTo(x-1, VisRect.bottom);
-        }
-    }
+		rect.top = rect.bottom+1;
+		rect.bottom = rect.top + GetRowHeight(row)-1;
+		rect.right = -1;
  
-    // draw horizontal lines (drawn at bottom of each cell)
-    if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
-    {
-        int y = nFixedRowHeight;
-        for (row = minVisibleRow; row <= maxVisibleRow; row++)
-        {
-            if (GetRowHeight(row) <= 0) continue;
+		for (col = 0; col < m_nFixedCols; col++)
+		{
+			if (GetColumnWidth(col) <= 0) continue;
+
+			rect.left = rect.right+1;
+			rect.right = rect.left + GetColumnWidth(col)-1;
+
+			pCell = GetCell(row, col);
+			// if (pCell)
+			//{
+			//pCell->SetCoords(row,col);
+			//pCell->Draw(pDC, row, col, rect, FALSE);
+			//}
+			if (pCell)
+			{
+				//Used for merge cells by Huang Wei
+				//bugfix by Luther Bruck
  
-            y += GetRowHeight(row);
-            pDC->MoveTo(nFixedColWidth, y-1);
-            pDC->LineTo(VisRect.right,  y-1);
-        }
-    }
+				if(!pCell->IsMerged())
+				{
+					if(!pCell->IsMergeWithOthers())
+					{
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, rect, FALSE);
+					}
+					else
+					{
+						CGridCellBase* pMergedCell=GetCell(pCell->GetMergeCellID());
+						CRect mergerect=rect;
+						if(GetCellRangeRect(pMergedCell->m_MergeRange,&mergerect))
+						{
+							mergerect.DeflateRect(0,0,1,1);
+							pMergedCell->SetCoords(pCell->GetMergeCellID().row,pCell->GetMergeCellID().col);
+							pMergedCell->Draw(pDC, pCell->GetMergeCellID().row,pCell->GetMergeCellID().col, mergerect, TRUE);
+						}
+					}
+				}
+				else
+				{
+					CRect mergerect=rect;
  
-    pDC->SelectStockObject(NULL_PEN);
+					if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+					{
+						mergerect.DeflateRect(0,0,1,1);
+						pCell->SetCoords(row,col);
+						pCell->Draw(pDC, row, col, mergerect, TRUE);
+					}
+				}
+			}
+		}
+	}
  
     // Let parent know it can discard it's data if it needs to.
     if (GetVirtualMode())
@@ -2047,24 +2154,18 @@ void CGridCtrl::SetSelectedRange(int nMinRow, int nMinCol, int nMaxRow, int nMax
         pDC = GetDC();
  
 	// Only redraw visible cells
-    CCellRange VisCellRange, FixedVisCellRange;
+    CCellRange VisCellRange;
 	if (IsWindow(GetSafeHwnd()))
-
-	{
 		VisCellRange = GetVisibleNonFixedCellRange();
-		FixedVisCellRange = GetVisibleFixedCellRange();
-	}
  
     // EFW - Bug fix - Don't allow selection of fixed rows
-	int Left= (m_AllowSelectRowInFixedCol ? 0 : GetFixedColumnCount());
-
     if(nMinRow >= 0 && nMinRow < GetFixedRowCount())
         nMinRow = GetFixedRowCount();
     if(nMaxRow >= 0 && nMaxRow < GetFixedRowCount())
         nMaxRow = GetFixedRowCount();
-    if(nMinCol >= 0 && nMinCol < Left)
+    if(nMinCol >= 0 && nMinCol < GetFixedColumnCount())
         nMinCol = GetFixedColumnCount();
-    if(nMaxCol >= 0 && nMaxCol < Left)
+    if(nMaxCol >= 0 && nMaxCol < GetFixedColumnCount())
         nMaxCol = GetFixedColumnCount();
  
     // If we are selecting cells, then first clear out the list of currently selected cells, then
@@ -2091,7 +2192,7 @@ void CGridCtrl::SetSelectedRange(int nMinRow, int nMinCol, int nMaxRow, int nMax
                     nMinCol <= cell.col && cell.col <= nMaxCol)
                     continue;
  
-				if ( (VisCellRange.IsValid() && VisCellRange.InRange( cell )) || FixedVisCellRange.InRange( cell ) )
+				if ( VisCellRange.IsValid() && VisCellRange.InRange( cell ) )
 				{
 					if (bForceRepaint && pDC)                    // Redraw NOW
 						RedrawCell(cell.row, cell.col, pDC);
@@ -2127,7 +2228,7 @@ void CGridCtrl::SetSelectedRange(int nMinRow, int nMinCol, int nMaxRow, int nMax
                 // Set state as Selected. This will add the cell to m_SelectedCellMap
                 SetItemState(cell.row, cell.col, nState | GVIS_SELECTED);
  
-				if (( VisCellRange.IsValid() && VisCellRange.InRange( cell ))  || FixedVisCellRange.InRange( cell )  )
+				if ( VisCellRange.IsValid() && VisCellRange.InRange( cell ) )
 				{
 					// Redraw (immediately or at leisure)
 					if (bForceRepaint && pDC)
@@ -2159,7 +2260,7 @@ void CGridCtrl::SetSelectedRange(int nMinRow, int nMinCol, int nMaxRow, int nMax
                 else
                     SetItemState(row, col, GetItemState(row, col) & ~GVIS_SELECTED);
  
-				if ( (VisCellRange.IsValid() && VisCellRange.InRange(row, col))  || FixedVisCellRange.InRange(row, col) )
+				if ( VisCellRange.IsValid() && VisCellRange.InRange(row, col) )
 				{
 	                // Redraw (immediately or at leisure)
 	                if (bForceRepaint && pDC)
@@ -2221,15 +2322,15 @@ void CGridCtrl::SelectRows(CCellID currentCell,
         return;
     if (!IsValid(currentCell))
         return;
-	int Left = ( m_AllowSelectRowInFixedCol ? 0 : GetFixedColumnCount());
+
     if (GetSingleRowSelection())
-        SetSelectedRange(currentCell.row, Left ,
+        SetSelectedRange(currentCell.row, GetFixedColumnCount(),
                          currentCell.row, GetColumnCount()-1, 
                          bForceRedraw, bSelectCells);
     else
         SetSelectedRange(min(m_SelectionStartCell.row, currentCell.row),
-                         Left,
-                         __max(m_SelectionStartCell.row, currentCell.row),
+                         GetFixedColumnCount(),
+                         max(m_SelectionStartCell.row, currentCell.row),
                          GetColumnCount()-1,
                          bForceRedraw, bSelectCells);
 }
@@ -2254,8 +2355,8 @@ void CGridCtrl::SelectCells(CCellID currentCell,
  
     SetSelectedRange(min(m_SelectionStartCell.row, row),
                      min(m_SelectionStartCell.col, col),
-                     __max(m_SelectionStartCell.row, row),
-                     __max(m_SelectionStartCell.col, col),
+                     max(m_SelectionStartCell.row, row),
+                     max(m_SelectionStartCell.col, col),
                      bForceRedraw, bSelectCells);
 }
  
@@ -2388,9 +2489,8 @@ COleDataSource* CGridCtrl::CopyTextFromGrid()
             if (col != Selection.GetMaxCol()) 
                 str += _T("\t");
         }
-
         if (row != Selection.GetMaxRow()) 
-            str += _T("\r\n");
+            str += _T("\n");
  
         sf.Write(T2A(str.GetBuffer(1)), str.GetLength());
         str.ReleaseBuffer();
@@ -2427,20 +2527,20 @@ BOOL CGridCtrl::PasteTextToGrid(CCellID cell, COleDataObject* pDataObject,
  
     // Get the text from the COleDataObject
     HGLOBAL hmem = pDataObject->GetGlobalData(CF_TEXT);
-    CMemFile sf((BYTE*) ::GlobalLock(hmem), (UINT)::GlobalSize(hmem));
+    CMemFile sf((BYTE*) ::GlobalLock(hmem), ::GlobalSize(hmem));
  
     // CF_TEXT is ANSI text, so we need to allocate a char* buffer
     // to hold this.
-    LPSTR szBuffer = new char[::GlobalSize(hmem)]; // FIX: Use LPSTR char here
+    LPSTR szBuffer = new char[::GlobalSize(hmem)];
     if (!szBuffer)
         return FALSE;
  
-    sf.Read(szBuffer, (UINT)::GlobalSize(hmem));
+    sf.Read(szBuffer, ::GlobalSize(hmem));
     ::GlobalUnlock(hmem);
  
     // Now store in generic TCHAR form so we no longer have to deal with
     // ANSI/UNICODE problems
-    CString strText(szBuffer);
+    CString strText = (LPWSTR)szBuffer;
     delete szBuffer;
  
     // Parse text data and set in cells...
@@ -2534,12 +2634,10 @@ BOOL CGridCtrl::PasteTextToGrid(CCellID cell, COleDataObject* pDataObject,
 // Start drag n drop
 void CGridCtrl::OnBeginDrag()
 {
-    COleDataSource* pSource = NULL;
-    if (!m_bAllowDragAndDrop && m_CurCol==-1)
+    if (!m_bAllowDragAndDrop)
         return;
  
-    if (m_CurCol>=0)	pSource = new COleDataSource();
-    if (!pSource && m_bAllowDragAndDrop) pSource = CopyTextFromGrid();
+    COleDataSource* pSource = CopyTextFromGrid();
     if (pSource)
     {
         SendMessageToParent(GetSelectedCellRange().GetTopLeft().row,
@@ -2556,7 +2654,6 @@ void CGridCtrl::OnBeginDrag()
  
         if (pSource)
             delete pSource;    // Did not pass source to clipboard, so must delete
-
     }
 }
  
@@ -2564,41 +2661,23 @@ void CGridCtrl::OnBeginDrag()
 DROPEFFECT CGridCtrl::OnDragOver(COleDataObject* pDataObject, DWORD dwKeyState,
                                  CPoint point)
 {
-    // Find which cell we are over and drop-highlight it
-    CCellID cell = GetCellFromPt(point, FALSE);
-	bool Valid;
     // Any text data available for us?
-	if(m_CurCol==-1)
-	{
-		if(m_bDragRowMode)
-		{
-			Valid = cell.col>=GetFixedColumnCount() && cell.row>=GetFixedRowCount();
-		}
-		else
-		{
     if (!m_bAllowDragAndDrop || !IsEditable() || !pDataObject->IsDataAvailable(CF_TEXT))
         return DROPEFFECT_NONE;
-			Valid = IsValid(cell)!=0;
-		}
-	}
-	else
-	{
-		Valid = cell.col>=GetFixedColumnCount() &&   cell.row<GetFixedRowCount() ;
-	}
  
+    // Find which cell we are over and drop-highlight it
+    CCellID cell = GetCellFromPt(point, FALSE);
  
     // If not valid, set the previously drop-highlighted cell as no longer drop-highlighted
-    if (!Valid)
+    if (!IsValid(cell))
     {
         OnDragLeave();
         m_LastDragOverCell = CCellID(-1,-1);
         return DROPEFFECT_NONE;
     }
-	if(m_CurCol==-1)
-	{
-		if (!m_bDragRowMode && !IsCellEditable(cell))
+
+    if (!IsCellEditable(cell))
         return DROPEFFECT_NONE;
-	}
  
     // Have we moved over a different cell than last time?
     if (cell != m_LastDragOverCell)
@@ -2636,28 +2715,18 @@ DROPEFFECT CGridCtrl::OnDragEnter(COleDataObject* pDataObject, DWORD dwKeyState,
                                   CPoint point)
 {
     // Any text data available for us?
-    m_LastDragOverCell = GetCellFromPt(point, m_CurCol>=0);
-	bool Valid;
-	if(m_CurCol==-1)
-	{
     if (!m_bAllowDragAndDrop || !pDataObject->IsDataAvailable(CF_TEXT))
         return DROPEFFECT_NONE;
  
     // Find which cell we are over and drop-highlight it
+    m_LastDragOverCell = GetCellFromPt(point, FALSE);
     if (!IsValid(m_LastDragOverCell))
         return DROPEFFECT_NONE;
  
     if (!IsCellEditable(m_LastDragOverCell))
         return DROPEFFECT_NONE;
-		Valid = IsValid(m_LastDragOverCell)!=0;
  
-	}
-	else
-	{
-		Valid = m_LastDragOverCell.row>=0 && m_LastDragOverCell.row<GetFixedRowCount() && m_LastDragOverCell.col>=GetFixedColumnCount();
-	}
-
-    if (Valid)
+    if (IsValid(m_LastDragOverCell))
     {
         UINT nState = GetItemState(m_LastDragOverCell.row, m_LastDragOverCell.col);
         SetItemState(m_LastDragOverCell.row, m_LastDragOverCell.col,
@@ -2690,39 +2759,14 @@ BOOL CGridCtrl::OnDrop(COleDataObject* pDataObject, DROPEFFECT /*dropEffect*/,
                        CPoint /* point */)
 {
     m_MouseMode = MOUSE_NOTHING;
-    if(m_CurCol ==-1)
-	{
-		if (!m_bAllowDragAndDrop || (!IsCellEditable(m_LastDragOverCell) && !m_bDragRowMode))
+    
+    if (!m_bAllowDragAndDrop || !IsCellEditable(m_LastDragOverCell))
         return FALSE;
-	}
  
     OnDragLeave();
-    if (m_CurCol>=0)
-	{
-		if(m_LastDragOverCell.col == m_CurCol || m_LastDragOverCell.row >= GetFixedRowCount()) 
-			return FALSE;
-		else
-		{
-			int New = m_arColOrder[m_CurCol];
-			m_arColOrder.erase(m_arColOrder.begin()+m_CurCol);
-			m_arColOrder.insert(m_arColOrder.begin()+m_LastDragOverCell.col, New);
-			m_CurCol=-1;
-			Invalidate();
-			return TRUE;
-		}
-	}
-	else
-	{
-		if(m_bDragRowMode)
-		{
-			Reorder(m_CurRow,m_LastDragOverCell.row);
-			Invalidate();
-			return TRUE;
-		}
-		else
+
     return PasteTextToGrid(m_LastDragOverCell, pDataObject, FALSE);
 }
-}
 #endif
  
 #ifndef GRIDCONTROL_NO_CLIPBOARD
@@ -2845,7 +2889,10 @@ BOOL CGridCtrl::MouseOverRowResizeArea(CPoint&amp; point)
     if (!GetCellOrigin(idCurrentCell, &start))
         return FALSE;
  
-    int endy = start.y + GetRowHeight(idCurrentCell.row);
+    //int endy = start.y + GetRowHeight(idCurrentCell.row);
+	//Merge the selected cells 
+	//by Huang Wei
+    int endy = start.y + GetMergeCellHeight(idCurrentCell);
  
     if ((point.y - start.y < m_nResizeCaptureRange && idCurrentCell.row != 0) ||
         endy - point.y < m_nResizeCaptureRange)
@@ -2867,7 +2914,10 @@ BOOL CGridCtrl::MouseOverColumnResizeArea(CPoint&amp; point)
     if (!GetCellOrigin(idCurrentCell, &start))
         return FALSE;
  
-    int endx = start.x + GetColumnWidth(idCurrentCell.col);
+    //int endx = start.x + GetColumnWidth(idCurrentCell.col);
+	//Merge the selected cells 
+	//by Huang Wei
+    int endx = start.x + GetMergeCellWidth(idCurrentCell);
  
     if ((point.x - start.x < m_nResizeCaptureRange && idCurrentCell.col != 0) ||
         endx - point.x < m_nResizeCaptureRange)
@@ -2905,7 +2955,6 @@ CCellID CGridCtrl::GetCellFromPt(CPoint point, BOOL bAllowFixedCellCheck /*=TRUE
                 break;
 			col++;
         }
-
         cellID.col = col;
     }
     else    // in non-fixed col
@@ -2960,6 +3009,7 @@ CCellID CGridCtrl::GetCellFromPt(CPoint point, BOOL bAllowFixedCellCheck /*=TRUE
         else
             cellID.row = row;
     }
+	cellID=GetMergeCellID(cellID);
     return cellID;
 }
  
@@ -2990,15 +3040,10 @@ CCellID CGridCtrl::GetTopleftNonFixedCell(BOOL bForceRecalculation /*=FALSE*/)
     return m_idTopLeftCell;
 }
  
-
-
-
-
 // This gets even partially visible cells
 CCellRange CGridCtrl::GetVisibleNonFixedCellRange(LPRECT pRect /*=NULL*/, 
                                                   BOOL bForceRecalculation /*=FALSE*/)
 {
-    int i;
     CRect rect;
     GetClientRect(rect);
  
@@ -3006,6 +3051,7 @@ CCellRange CGridCtrl::GetVisibleNonFixedCellRange(LPRECT pRect /*=NULL*/,
  
     // calc bottom
     int bottom = GetFixedRowHeight();
+	int i = 0;
     for (i = idTopLeft.row; i < GetRowCount(); i++)
     {
         bottom += GetRowHeight(i);
@@ -3039,54 +3085,6 @@ CCellRange CGridCtrl::GetVisibleNonFixedCellRange(LPRECT pRect /*=NULL*/,
     return CCellRange(idTopLeft.row, idTopLeft.col, maxVisibleRow, maxVisibleCol);
 }
  
-
-CCellRange CGridCtrl::GetVisibleFixedCellRange(LPRECT pRect /*=NULL*/, 
-                                                  BOOL bForceRecalculation /*=FALSE*/)
-{
-    int i;
-    CRect rect;
-    GetClientRect(rect);
-
-    CCellID idTopLeft = GetTopleftNonFixedCell(bForceRecalculation);
-
-    // calc bottom
-    int bottom = GetFixedRowHeight();
-    for (i = idTopLeft.row; i < GetRowCount(); i++)
-    {
-        bottom += GetRowHeight(i);
-        if (bottom >= rect.bottom)
-        {
-            bottom = rect.bottom;
-            break;
-        }
-    }
-    int maxVisibleRow = min(i, GetRowCount() - 1);
-
-    // calc right
-    int right = 0;
-    for (i = 0; i < GetFixedColumnCount(); i++)
-    {
-        right += GetColumnWidth(i);
-        if (right >= rect.right)
-        {
-            right = rect.right;
-            break;
-        }
-    }
-    int maxVisibleCol = min(i, GetColumnCount() - 1);
-    if (pRect)
-    {
-        pRect->left = pRect->top = 0;
-        pRect->right = right;
-        pRect->bottom = bottom;
-    }
-
-    return CCellRange(idTopLeft.row, 0, maxVisibleRow, maxVisibleCol);
-}
-
-
-
-
 // used by ResetScrollBars() - This gets only fully visible cells
 CCellRange CGridCtrl::GetUnobstructedNonFixedCellRange(BOOL bForceRecalculation /*=FALSE*/)
 {
@@ -3096,8 +3094,8 @@ CCellRange CGridCtrl::GetUnobstructedNonFixedCellRange(BOOL bForceRecalculation 
     CCellID idTopLeft = GetTopleftNonFixedCell(bForceRecalculation);
  
     // calc bottom
-    int i;
     int bottom = GetFixedRowHeight();
+	int i = 0;
     for (i = idTopLeft.row; i < GetRowCount(); i++)
     {
         bottom += GetRowHeight(i);
@@ -3138,8 +3136,8 @@ CCellRange CGridCtrl::GetSelectedCellRange() const
  
         Selection.SetMinRow( min(Selection.GetMinRow(), cell.row) );
         Selection.SetMinCol( min(Selection.GetMinCol(), cell.col) );
-        Selection.SetMaxRow( __max(Selection.GetMaxRow(), cell.row) );
-        Selection.SetMaxCol( __max(Selection.GetMaxCol(), cell.col) );
+        Selection.SetMaxRow( max(Selection.GetMaxRow(), cell.row) );
+        Selection.SetMaxCol( max(Selection.GetMaxCol(), cell.col) );
     }
  
     return Selection;
@@ -3341,6 +3339,7 @@ void CGridCtrl::ResetScrollBars()
 // Row/Column position functions
  
 // returns the top left point of the cell. Returns FALSE if cell not visible.
+// consider cell's merge
 BOOL CGridCtrl::GetCellOrigin(int nRow, int nCol, LPPOINT p)
 {
     int i;
@@ -3352,6 +3351,72 @@ BOOL CGridCtrl::GetCellOrigin(int nRow, int nCol, LPPOINT p)
     if (nCol >= m_nFixedCols || nRow >= m_nFixedRows)
         idTopLeft = GetTopleftNonFixedCell();
  
+	//Merge the selected cells 
+	//by Huang Wei
+
+    //if ((nRow >= m_nFixedRows && nRow < idTopLeft.row) ||
+    //    (nCol>= m_nFixedCols && nCol < idTopLeft.col))
+    //    return FALSE;
+
+    p->x = 0;
+    if (nCol < m_nFixedCols)                      // is a fixed column
+        for (i = 0; i < nCol; i++)
+            p->x += GetColumnWidth(i);
+        else 
+        {                                        // is a scrollable data column
+            for (i = 0; i < m_nFixedCols; i++)
+                p->x += GetColumnWidth(i);
+			//Merge the selected cells 
+			//by Huang Wei
+			if(nCol>idTopLeft.col)
+			{
+				for (i = idTopLeft.col; i < nCol; i++)
+					p->x += GetColumnWidth(i);
+			}
+			else
+			{
+				for (i = nCol; i <idTopLeft.col ; i++)
+					p->x -= GetColumnWidth(i);
+			}
+        }
+        
+        p->y = 0;
+        if (nRow < m_nFixedRows)                      // is a fixed row
+            for (i = 0; i < nRow; i++)
+                p->y += GetRowHeight(i);
+            else 
+            {                                        // is a scrollable data row
+                for (i = 0; i < m_nFixedRows; i++)
+                    p->y += GetRowHeight(i);
+ 				//Merge the selected cells 
+				//by Huang Wei
+				if(nRow>idTopLeft.row)
+				{
+					for (i = idTopLeft.row; i < nRow; i++)
+						p->y += GetRowHeight(i);
+				}
+				else
+				{
+					for (i = nRow; i <idTopLeft.row; i++)
+						p->y -= GetRowHeight(i);
+				}
+            }
+            
+            return TRUE;
+}
+// returns the top left point of the cell. Returns FALSE if cell not visible.
+// don't consider cell's merge
+BOOL CGridCtrl::GetCellOriginNoMerge(int nRow, int nCol, LPPOINT p)
+{
+    int i;
+
+    if (!IsValid(nRow, nCol))
+        return FALSE;
+
+    CCellID idTopLeft;
+    if (nCol >= m_nFixedCols || nRow >= m_nFixedRows)
+        idTopLeft = GetTopleftNonFixedCell();
+
     if ((nRow >= m_nFixedRows && nRow < idTopLeft.row) ||
         (nCol>= m_nFixedCols && nCol < idTopLeft.col))
         return FALSE;
@@ -3383,10 +3448,16 @@ BOOL CGridCtrl::GetCellOrigin(int nRow, int nCol, LPPOINT p)
             return TRUE;
 }
  
+
+
 BOOL CGridCtrl::GetCellOrigin(const CCellID& cell, LPPOINT p)
 {
     return GetCellOrigin(cell.row, cell.col, p);
 }
+BOOL CGridCtrl::GetCellOriginNoMerge(const CCellID& cell, LPPOINT p)
+{
+    return GetCellOriginNoMerge(cell.row, cell.col, p);
+}
  
 // Returns the bounding box of the cell
 BOOL CGridCtrl::GetCellRect(const CCellID& cell, LPRECT pRect)
@@ -3400,11 +3471,21 @@ BOOL CGridCtrl::GetCellRect(int nRow, int nCol, LPRECT pRect)
     if (!GetCellOrigin(nRow, nCol, &CellOrigin))
         return FALSE;
  
-    pRect->left   = CellOrigin.x;
-    pRect->top    = CellOrigin.y;
-    pRect->right  = CellOrigin.x + GetColumnWidth(nCol)-1;
-    pRect->bottom = CellOrigin.y + GetRowHeight(nRow)-1;
-
+    //Merge the selected cells 
+    //by Huang Wei
+    CGridCellBase *pCell = (CGridCellBase*) GetCell(nRow,nCol);
+	
+	if(!pCell->IsMerged())
+	{
+		pRect->left   = CellOrigin.x;
+		pRect->top    = CellOrigin.y;
+		pRect->right  = CellOrigin.x + GetColumnWidth(nCol)-1;
+		pRect->bottom = CellOrigin.y + GetRowHeight(nRow)-1;
+	}
+	else
+	{
+		GetCellRangeRect(pCell->m_MergeRange,pRect);
+	}
     //TRACE("Row %d, col %d: L %d, T %d, W %d, H %d:  %d,%d - %d,%d\n",
     //      nRow,nCol, CellOrigin.x, CellOrigin.y, GetColumnWidth(nCol), GetRowHeight(nRow),
     //      pRect->left, pRect->top, pRect->right, pRect->bottom);
@@ -3686,7 +3767,6 @@ BOOL CGridCtrl::SetRowCount(int nRows)
                 for (int row = startRow; row < nRows; row++)
                     m_arRowHeights[row] = m_cellDefault.GetHeight();
             }
-			ResetVirtualOrder();
         }
         else
         {
@@ -3774,17 +3854,16 @@ BOOL CGridCtrl::SetColumnCount(int nCols)
         // and set the default column width
         if (addedCols > 0)
         {
-            int row, col;
-
             // initialized column widths
             int startCol = nCols - addedCols;
+			int col = 0;
             for (col = startCol; col < nCols; col++)
                 m_arColWidths[col] = m_cellFixedColDef.GetWidth();
  
             // initialise column data
             if (!GetVirtualMode())
             {
-                for (row = 0; row < m_nRows; row++)
+                for (int row = 0; row < m_nRows; row++)
                     for (col = startCol; col < nCols; col++)
                     {
                         GRID_ROW* pRow = m_RowData[row];
@@ -3803,12 +3882,6 @@ BOOL CGridCtrl::SetColumnCount(int nCols)
     }
     END_CATCH
  
-	m_arColOrder.resize(nCols);  // Reset Column Order
-    for (int i = 0; i < nCols; i++)
-	{
-		m_arColOrder[i] = i;	
-	}
-
     m_nCols = nCols;
  
     SetModified();
@@ -3823,7 +3896,6 @@ int CGridCtrl::InsertColumn(LPCTSTR strHeading,
                             UINT nFormat /* = DT_CENTER|DT_VCENTER|DT_SINGLELINE */,
                             int nColumn  /* = -1 */)
 {
-	ASSERT(!m_AllowReorderColumn); // function not implemented in case of m_AllowReorderColumn option
     if (nColumn >= 0 && nColumn < m_nFixedCols)
     {
  
@@ -3886,18 +3958,11 @@ int CGridCtrl::InsertColumn(LPCTSTR strHeading,
     CATCH (CMemoryException, e)
     {
         e->ReportError();
-        return -1;
+        return FALSE;
     }
     END_CATCH
  
     m_nCols++;
-
-	// Column Order
-	m_arColOrder.resize(m_nCols);
-	for (int i = 0; i < m_nCols; i++)
-	{
-		m_arColOrder[i] = i;
-	}
  
     // Initialise column data
     SetItemText(0, nColumn, strHeading);
@@ -3949,19 +4014,12 @@ int CGridCtrl::InsertRow(LPCTSTR strHeading, int nRow /* = -1 */)
             m_arRowHeights.Add(0);
             if (!GetVirtualMode())
                 m_RowData.Add(new GRID_ROW);
-			else
-				m_arRowOrder.push_back(m_nRows);
-
         }
         else
         {
             m_arRowHeights.InsertAt(nRow, (UINT)0);
             if (!GetVirtualMode())
                 m_RowData.InsertAt(nRow, new GRID_ROW);
-			else
-			{
-				ResetVirtualOrder();
-			}
         }
  
         if (!GetVirtualMode())
@@ -3970,7 +4028,7 @@ int CGridCtrl::InsertRow(LPCTSTR strHeading, int nRow /* = -1 */)
     CATCH (CMemoryException, e)
     {
         e->ReportError();
-        return -1;
+        return FALSE;
     }
     END_CATCH
  
@@ -4126,20 +4184,6 @@ BOOL CGridCtrl::DeleteColumn(int nColumn)
     return TRUE;
 }
  
-
-void CGridCtrl::AddSubVirtualRow(int Num, int Nb)
-{
-	ASSERT(Nb == -1 || Nb ==1); // only these vlaues are implemented now
-	if(!GetVirtualMode()) return;
-	for(int ind = 0; ind<m_nRows ; ind++)
-		if(m_arRowOrder[ind]>Num) m_arRowOrder[ind]+=Nb;
-	if(Nb>0)
-		m_arRowOrder.insert(m_arRowOrder.begin()+Num,Num);
-	else
-		m_arRowOrder.erase(m_arRowOrder.begin()+Num);
-}
-
-
 BOOL CGridCtrl::DeleteRow(int nRow)
 {
     if (nRow < 0 || nRow >= GetRowCount())
@@ -4159,8 +4203,6 @@ BOOL CGridCtrl::DeleteRow(int nRow)
         delete pRow;
         m_RowData.RemoveAt(nRow);
     }
-    else
-    	AddSubVirtualRow(nRow,-1);
  
     m_arRowHeights.RemoveAt(nRow);
  
@@ -4184,26 +4226,14 @@ BOOL CGridCtrl::DeleteRow(int nRow)
 BOOL CGridCtrl::DeleteNonFixedRows()
 {
     ResetSelectedRange();
+
     int nFixed = GetFixedRowCount();
     int nCount = GetRowCount();
-    if (GetVirtualMode())
-	{
-		if(nCount != nFixed)
-		{
-			SetRowCount(nFixed);
-			m_arRowOrder.resize(nFixed);
-			m_arRowHeights.SetSize(nFixed);
-			m_idCurrentCell.row = m_idCurrentCell.col = -1;
-			ResetScrollBars();
-			SetModified();
-		}
-	}
-	else
-	{
+
     // Delete all data rows
     for (int nRow = nCount; nRow >= nFixed; nRow--)
         DeleteRow(nRow);
-	}
+
     return TRUE;
 }
  
@@ -4230,9 +4260,6 @@ BOOL CGridCtrl::DeleteAllItems()
         // Remove all rows
         m_RowData.RemoveAll();
     }
-	else
-		m_arRowOrder.clear();
-
  
     m_idCurrentCell.row = m_idCurrentCell.col = -1;
     m_nRows = m_nFixedRows = m_nCols = m_nFixedCols = 0;
@@ -4380,6 +4407,10 @@ CCellID CGridCtrl::GetNextItem(CCellID&amp; cell, int nFlags) const
 // Sorts on a given column using the cell text
 BOOL CGridCtrl::SortTextItems(int nCol, BOOL bAscending, LPARAM data /* = 0 */)
 {
+    SetSortColumn(nCol);
+    SetSortAscending(bAscending);
+    ResetSelectedRange();
+    SetFocusCell(-1, - 1);
     return CGridCtrl::SortItems(pfnCellTextCompare, nCol, bAscending, data);
 }
  
@@ -4444,13 +4475,7 @@ int CALLBACK CGridCtrl::pfnCellNumericCompare(LPARAM lParam1, LPARAM lParam2, LP
 		return 1;
 }
  
-
-CGridCtrl *  CGridCtrl::m_This;
 // private recursive sort implementation
-bool CGridCtrl::NotVirtualCompare(int c1, int c2)
-{
-	return ! CGridCtrl::m_This->m_pfnVirtualCompare(c1, c2);
-}
 BOOL CGridCtrl::SortItems(PFNLVCOMPARE pfnCompare, int nCol, BOOL bAscending, LPARAM data,
                           int low, int high)
 {
@@ -4465,17 +4490,6 @@ BOOL CGridCtrl::SortItems(PFNLVCOMPARE pfnCompare, int nCol, BOOL bAscending, LP
  
     if (hi <= lo)
         return FALSE;
-
-    if (GetVirtualMode())
-	{
-		ASSERT(m_pfnVirtualCompare);
-		m_CurCol = m_arColOrder[nCol];
-		m_This = this;
-		std::stable_sort(m_arRowOrder.begin() + m_nFixedRows, m_arRowOrder.end(), 
-                         bAscending ? m_pfnVirtualCompare : NotVirtualCompare);
-		return TRUE;
-	}
-   
  
     //LPARAM midItem = GetItemData((lo + hi)/2, nCol);
 	LPARAM pMidCell = (LPARAM) GetCell((lo + hi)/2, nCol);
@@ -4907,7 +4921,7 @@ int CGridCtrl::GetColumnWidth(int nCol) const
     if (nCol < 0 || nCol >= m_nCols)
         return -1;
  
-    return m_arColWidths[m_arColOrder[nCol]];
+    return m_arColWidths[nCol];
 }
  
 BOOL CGridCtrl::SetRowHeight(int nRow, int height)
@@ -4928,7 +4942,7 @@ BOOL CGridCtrl::SetColumnWidth(int nCol, int width)
     if (nCol < 0 || nCol >= m_nCols || width < 0)
         return FALSE;
  
-    m_arColWidths[m_arColOrder[nCol]] = width;
+    m_arColWidths[nCol] = width;
     ResetScrollBars();
  
     return TRUE;
@@ -5143,13 +5157,13 @@ void CGridCtrl::ExpandColumnsToFit(BOOL bExpandFixed /*=TRUE*/)
  
     EnableScrollBars(SB_HORZ, FALSE);
  
-    int col;
     CRect rect;
     GetClientRect(rect);
  
     int nFirstColumn = (bExpandFixed)? 0 : GetFixedColumnCount();
  
     int nNumColumnsAffected = 0;
+	int col = 0;
     for (col = nFirstColumn; col < GetColumnCount(); col++)
     {
         if (m_arColWidths[col] > 0)
@@ -5243,13 +5257,13 @@ void CGridCtrl::ExpandRowsToFit(BOOL bExpandFixed /*=TRUE*/)
  
     EnableScrollBars(SB_VERT, FALSE); 
  
-    int row;
     CRect rect;
     GetClientRect(rect);
  
     int nFirstRow = (bExpandFixed)? 0 : GetFixedRowCount();
  
     int nNumRowsAffected = 0;
+	int row = 0;
     for (row = nFirstRow; row < GetRowCount(); row++)
     {
         if (m_arRowHeights[row] > 0)
@@ -5318,10 +5332,10 @@ void CGridCtrl::SetVirtualMode(BOOL bVirtual)
     if (m_bVirtualMode)
     {
         SetEditable(FALSE);
+        SetHeaderSort(FALSE);
         SetAutoSizeStyle(GVS_HEADER);
         SetFixedColumnSelection(FALSE);
         SetFixedRowSelection(FALSE);
-		ResetVirtualOrder();
     }
 }
  
@@ -5426,7 +5440,7 @@ void CGridCtrl::EnsureVisible(int nRow, int nCol)
     }
     */
  
-    // We are going to send some scroll messages, which will steal the focus 
+    // We are gonna send some scroll messages, which will steal the focus 
     // from it's rightful owner. Squirrel it away ourselves so we can give
     // it back. (Damir)
     CWnd* pFocusWnd = GetFocus();
@@ -5489,35 +5503,34 @@ void CGridCtrl::EnsureVisible(int nRow, int nCol)
  
     GetClientRect(rectWindow);
  
-    // The previous fix was fixed properly by Martin Richter 
+    // The previous fix was fixed properly by Martin Richter <martin.richter@grutzeck.de>
     while (rectCell.right > rectWindow.right
-        && rectCell.left > GetFixedColumnWidth()
-        && IsVisibleHScroll() // Junlin Xu: added to prevent infinite loop
-        )
+           && rectCell.left > GetFixedColumnWidth())
     {
         SendMessage(WM_HSCROLL, SB_LINERIGHT, 0);
         if (!GetCellRect(nRow, nCol, rectCell))
         {
-            pFocusWnd->SetFocus(); 
+			if (pFocusWnd && ::IsWindow(pFocusWnd->GetSafeHwnd()))
+				pFocusWnd->SetFocus(); 
             return;
         }
     }
  
     while (rectCell.bottom > rectWindow.bottom
-        && rectCell.top > GetFixedRowHeight()
-        && IsVisibleVScroll() // Junlin Xu: added to prevent infinite loop
-        )
+           && rectCell.top > GetFixedRowHeight())
     {
         SendMessage(WM_VSCROLL, SB_LINEDOWN, 0);
         if (!GetCellRect(nRow, nCol, rectCell))
         {
-            pFocusWnd->SetFocus(); 
+			if (pFocusWnd && ::IsWindow(pFocusWnd->GetSafeHwnd()))
+				pFocusWnd->SetFocus(); 
             return;
         }
     }
  
     // restore focus to whoever owned it
-    pFocusWnd->SetFocus(); 
+	if (pFocusWnd && ::IsWindow(pFocusWnd->GetSafeHwnd()))
+		pFocusWnd->SetFocus(); 
 }
  
 BOOL CGridCtrl::IsCellEditable(CCellID &cell) const
@@ -5798,7 +5811,7 @@ void CGridCtrl::OnMouseMove(UINT /*nFlags*/, CPoint point)
                         && pCell->GetTipTextRect( &TextRect)
                         && GetCellRect(idCurrentCell.row, idCurrentCell.col, CellRect) )
                     {
-//						TRACE0("Showing TitleTip\n");
+						TRACE0("Showing TitleTip\n");
 						m_TitleTip.Show(TextRect, pCell->GetTipText(),  0, CellRect,
                                         pCell->GetFont(),  GetTitleTipTextClr(), GetTitleTipBackClr());
                     }
@@ -6033,13 +6046,12 @@ void CGridCtrl::OnLButtonDown(UINT nFlags, CPoint point)
     // CWnd::OnLButtonDown(nFlags, point);
  
     SetFocus();
-	m_CurCol = -1;
+
     m_bLMouseButtonDown   = TRUE;
     m_LeftClickDownPoint = point;
     m_LeftClickDownCell  = GetCellFromPt(point);
     if (!IsValid(m_LeftClickDownCell))
         return;
-	m_CurRow = m_LeftClickDownCell.row;
  
     // If the SHIFT key is not down, then the start of the selection area should be the 
     // cell just clicked. Otherwise, keep the previous selection-start-cell so the user
@@ -6085,8 +6097,6 @@ void CGridCtrl::OnLButtonDown(UINT nFlags, CPoint point)
     // (If the user moves the mouse, then dragging occurs)
     else if (IsCellSelected(m_LeftClickDownCell))
     {
-        SetFocusCell(m_LeftClickDownCell.row, m_LeftClickDownCell.col);
-
         // If control is pressed then unselect the cell or row (depending on the list mode)
         if (nFlags & MK_CONTROL)
         {
@@ -6355,16 +6365,7 @@ void CGridCtrl::OnLButtonDown(UINT nFlags, CPoint point)
         }
  
         if (m_LeftClickDownCell.row < GetFixedRowCount())
-		{
             OnFixedRowClick(m_LeftClickDownCell);
-            if(m_AllowReorderColumn && m_LeftClickDownCell.col >=  GetFixedColumnCount())
-			{
-				ResetSelectedRange(); // TODO : This is not the better solution, as we do not see why clicking in column header should reset selection
-											//but the state of selection is instable after drag (at least until someone debugs it), so better clear it allways.
-				m_MouseMode = MOUSE_PREPARE_DRAG;
-				m_CurCol = m_LeftClickDownCell.col;
-			}
-		}
         else if (m_LeftClickDownCell.col < GetFixedColumnCount())
             OnFixedColumnClick(m_LeftClickDownCell);
         else
@@ -6436,12 +6437,18 @@ void CGridCtrl::OnLButtonUp(UINT nFlags, CPoint point)
         if (m_LeftClickDownPoint != point && (point.x != 0 || point.y != 0)) // 0 pt fix by email1@bierling.net
         {   
             CPoint start;
+			//Used for merge cells
+			//by Huang Wei
+			m_LeftClickDownCell=GetMergeCellID(m_LeftClickDownCell);
             if (!GetCellOrigin(m_LeftClickDownCell, &start))
                 return;
  
-            int nColumnWidth = __max(point.x - start.x, m_bAllowColHide? 0 : 1);
+            int nColumnWidth = max(point.x - start.x, m_bAllowColHide? 0 : 1);
+			//Used for merge cells
+			//by Huang Wei
+			int mergewidth=GetMergeCellWidth(m_LeftClickDownCell)-GetColumnWidth(m_LeftClickDownCell.col);
+            SetColumnWidth(m_LeftClickDownCell.col, nColumnWidth-mergewidth);
  
-            SetColumnWidth(m_LeftClickDownCell.col, nColumnWidth);
             ResetScrollBars();
             Invalidate();
         }
@@ -6462,12 +6469,18 @@ void CGridCtrl::OnLButtonUp(UINT nFlags, CPoint point)
         if (m_LeftClickDownPoint != point  && (point.x != 0 || point.y != 0)) // 0 pt fix by email1@bierling.net
         {
             CPoint start;
+			//Used for merge cells
+			//by Huang Wei
+			m_LeftClickDownCell=GetMergeCellID(m_LeftClickDownCell);
             if (!GetCellOrigin(m_LeftClickDownCell, &start))
                 return;
  
-            int nRowHeight = __max(point.y - start.y, m_bAllowRowHide? 0 : 1);
+            int nRowHeight = max(point.y - start.y, m_bAllowRowHide? 0 : 1);
+			//Used for merge cells
+			//by Huang Wei
+			int mergeheight=GetMergeCellHeight(m_LeftClickDownCell)-GetRowHeight(m_LeftClickDownCell.row);
  
-            SetRowHeight(m_LeftClickDownCell.row, nRowHeight);
+            SetRowHeight(m_LeftClickDownCell.row, nRowHeight-mergeheight);
             ResetScrollBars();
             Invalidate();
         }
@@ -6509,7 +6522,6 @@ void CGridCtrl::OnRButtonDown(UINT nFlags, CPoint point)
 #endif
 }
  
-#include "resource.h"
 // EFW - Added to forward right click to parent so that a context
 // menu can be shown without deriving a new grid class.
 void CGridCtrl::OnRButtonUp(UINT nFlags, CPoint point)
@@ -6529,8 +6541,8 @@ void CGridCtrl::OnRButtonUp(UINT nFlags, CPoint point)
     else
     {
         SetFocusCell(-1,-1);
-        SetFocusCell(__max(FocusCell.row, m_nFixedRows),
-            __max(FocusCell.col, m_nFixedCols));
+        SetFocusCell(max(FocusCell.row, m_nFixedRows),
+            max(FocusCell.col, m_nFixedCols));
  
         // tell the cell about it
         CGridCellBase* pCell = GetCell(FocusCell.row, FocusCell.col);
@@ -6539,13 +6551,6 @@ void CGridCtrl::OnRButtonUp(UINT nFlags, CPoint point)
  
         SendMessageToParent(FocusCell.row, FocusCell.col, NM_RCLICK);
     }
-
-	//右键菜单
-	CMenu menu;
-	menu.LoadMenu(IDR_MENU1);
-	CMenu *pPopup = menu.GetSubMenu(0);
-	GetCursorPos(&point);//获取当前光标的位置，以便使得菜单可以跟随光标 
-	pPopup->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, GetParent());//在指定位置显示弹出菜单
 }
 #endif
  
@@ -6676,7 +6681,7 @@ void CGridCtrl::OnBeginPrinting(CDC *pDC, CPrintInfo *pInfo)
  
     // Create the printer font
     int nFontSize = -10;
-    CString strFontName = _T("Arial");
+    CString strFontName = L"Arial";
     m_PrinterFont.CreateFont(nFontSize, 0,0,0, FW_NORMAL, 0,0,0, DEFAULT_CHARSET,
                              OUT_CHARACTER_PRECIS, CLIP_CHARACTER_PRECIS, DEFAULT_QUALITY,
                              DEFAULT_PITCH | FF_DONTCARE, strFontName);
@@ -6894,6 +6899,25 @@ void CGridCtrl::OnPrint(CDC *pDC, CPrintInfo *pInfo)
     BOOL bFirstPrintedRow = TRUE;
     CRect rect;
     rect.bottom = -1;
+
+	//Used for merge cells
+	//by Huang Wei
+	int Row=m_nCurrPrintRow;
+	CRect range;
+    range.bottom = -1;
+    while (Row < GetRowCount())
+    {
+        range.top = range.bottom+1;
+        range.bottom = range.top + GetRowHeight(Row) - 1;
+
+        if (range.bottom > m_nPageHeight) 
+		{
+			range.bottom=range.top;
+			break;            
+		}
+        Row++;
+    }
+
     while (m_nCurrPrintRow < GetRowCount())
     {
         rect.top = rect.bottom+1;
@@ -6916,34 +6940,60 @@ void CGridCtrl::OnPrint(CDC *pDC, CPrintInfo *pInfo)
  
             CGridCellBase* pCell = GetCell(m_nCurrPrintRow, col);
             if (pCell)
-                pCell->PrintCell(pDC, m_nCurrPrintRow, col, rect);
+			{      
+				//Used for merge cells
+				//by Huang Wei
+				int row=m_nCurrPrintRow;
+				if(!pCell->IsMerged())
+				{
+					if(!pCell->IsMergeWithOthers())
+					{
+						pCell->PrintCell(pDC, row, col, rect);
+					}
+				}
+				else
+				{
+					CRect mergerect=rect;
+					if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+					{
+						//mergerect.DeflateRect(0,0,1,1);
+						mergerect.OffsetRect(rect.TopLeft()-mergerect.TopLeft());
+						pCell->PrintCell(pDC, row, col, mergerect);
+					}
+				}
+			}
  
-            if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
-            {
-                int Overlap = (col == 0)? 0:1;
-                pDC->MoveTo(rect.left-Overlap, rect.bottom);
-                pDC->LineTo(rect.right, rect.bottom);
-                if (m_nCurrPrintRow == 0) {
-                    pDC->MoveTo(rect.left-Overlap, rect.top);
-                    pDC->LineTo(rect.right, rect.top);
-                }
-            }
-            if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
-            {
-                int Overlap = (bFirstPrintedRow)? 0:1;
-                pDC->MoveTo(rect.right, rect.top-Overlap);
-                pDC->LineTo(rect.right, rect.bottom);
-                if (col == 0) {
-                    pDC->MoveTo(rect.left, rect.top-Overlap);
-                    pDC->LineTo(rect.left, rect.bottom);
-                }
-            }
+            //if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
+            //{
+            //    int Overlap = (col == 0)? 0:1;
+            //    pDC->MoveTo(rect.left-Overlap, rect.bottom);
+            //    pDC->LineTo(rect.right, rect.bottom);
+            //    if (m_nCurrPrintRow == 0) {
+            //        pDC->MoveTo(rect.left-Overlap, rect.top);
+            //        pDC->LineTo(rect.right, rect.top);
+            //    }
+            //}
+            //if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
+            //{
+            //    int Overlap = (bFirstPrintedRow)? 0:1;
+            //    pDC->MoveTo(rect.right, rect.top-Overlap);
+            //    pDC->LineTo(rect.right, rect.bottom);
+            //    if (col == 0) {
+            //        pDC->MoveTo(rect.left, rect.top-Overlap);
+            //        pDC->LineTo(rect.left, rect.bottom);
+            //    }
+            //}
  
         }
         m_nCurrPrintRow++;
         bFirstPrintedRow = FALSE;
     }
  
+	//Used for merge cells
+	//by Huang Wei
+	CRect white_rect(CPoint(0,0),m_LogicalPageSize);
+	white_rect.top=range.bottom+1;
+	pDC->FillSolidRect(white_rect,RGB(255,255,255));
  
     // Footer
     pInfo->m_rectDraw.bottom = m_nFooterHeight * m_CharSize.cy;
@@ -6973,37 +7023,58 @@ void CGridCtrl::PrintFixedRowCells(int nStartColumn, int nStopColumn, int&amp; row, 
  
       CGridCellBase* pCell = GetCell(row, col);
       if (pCell)
-         pCell->PrintCell(pDC, row, col, rect);
+	  {
+			//Used for merge cells
+			//by Huang Wei
+			int row=m_nCurrPrintRow;
+			if(!pCell->IsMerged())
+			{
+				if(!pCell->IsMergeWithOthers())
+				{
+					pCell->PrintCell(pDC, row, col, rect);
+				}
+			}
+			else
+			{
+				CRect mergerect=rect;
+				if(GetCellRangeRect(pCell->m_MergeRange,&mergerect))
+				{
+					//mergerect.DeflateRect(0,0,1,1);
+					mergerect.OffsetRect(rect.TopLeft()-mergerect.TopLeft());
+					pCell->PrintCell(pDC, row, col, mergerect);
+				}
+			}
+	  }
  
-      if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
-      {
-         int Overlap = (col == 0)? 0:1;
-         
-         pDC->MoveTo(rect.left-Overlap, rect.bottom);
-         pDC->LineTo(rect.right, rect.bottom);
-         
-         if (row == 0)
-         {
-            pDC->MoveTo(rect.left-Overlap, rect.top);
-            pDC->LineTo(rect.right, rect.top);
-          }
-      }
-
-      if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
-      {
-         int Overlap = (row == 0)? 0:1;
-
-         pDC->MoveTo(rect.right, rect.top-Overlap);
-         pDC->LineTo(rect.right, rect.bottom);
-         
-         if( bFirst)
-         {
-            pDC->MoveTo(rect.left-1, rect.top-Overlap);
-            pDC->LineTo(rect.left-1, rect.bottom);
-            bFirst = FALSE;
-          }
-
-       }
+      //if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_HORZ)
+      //{
+      //   int Overlap = (col == 0)? 0:1;
+      //   
+      //   pDC->MoveTo(rect.left-Overlap, rect.bottom);
+      //   pDC->LineTo(rect.right, rect.bottom);
+      //   
+      //   if (row == 0)
+      //   {
+      //      pDC->MoveTo(rect.left-Overlap, rect.top);
+      //      pDC->LineTo(rect.right, rect.top);
+      //    }
+      //}
+
+      //if (m_nGridLines == GVL_BOTH || m_nGridLines == GVL_VERT)
+      //{
+      //   int Overlap = (row == 0)? 0:1;
+
+      //   pDC->MoveTo(rect.right, rect.top-Overlap);
+      //   pDC->LineTo(rect.right, rect.bottom);
+      //   
+      //   if( bFirst)
+      //   {
+      //      pDC->MoveTo(rect.left-1, rect.top-Overlap);
+      //      pDC->LineTo(rect.left-1, rect.bottom);
+      //      bFirst = FALSE;
+      //    }
+
+      // }
  
    } // end of column cells loop
  
@@ -7297,7 +7368,7 @@ BOOL CGridCtrl::Load(LPCTSTR filename, TCHAR chSeparator/*=_T(&#39;,&#39;)*/)
         }
  
         // Read in rest of data
-        int nItem = 1;
+        int nItem = 0;
         while (File.ReadString(buffer, 1024))
         {
             // Get first token
@@ -7567,24 +7638,116 @@ CString CGridCtrl::GetItemText(int nRow, int nCol) const
  
     return pCell->GetText();
 }
-
-void CGridCtrl::ResetVirtualOrder()
+//Merge the selected cells 
+//by Huang Wei
+CCellID CGridCtrl::GetMergeCellID(CCellID cell)
+{
+    CGridCellBase *pCell = (CGridCellBase*) GetCell(cell);
+	if(pCell && pCell->IsMergeWithOthers())
+		return pCell->GetMergeCellID();
+	return cell;
+}
+//Merge the selected cells 
+//by Huang Wei
+CGridCellBase* CGridCtrl::GetCell(CCellID cell)
 {
-	m_arRowOrder.resize(m_nRows);  
-    for (int i = 0; i < m_nRows; i++)
+	return GetCell(cell.row,cell.col);
+}
+//Merge the selected cells 
+//by Huang Wei
+void CGridCtrl::MergeSelectedCells()
+{
+	CCellRange range=GetSelectedCellRange();
+	if(range.GetColSpan()<=1 && range.GetRowSpan()<=1)
+		return;
+	MergeCells(range.GetMinRow(), range.GetMinCol(), range.GetMaxRow(), range.GetMaxCol());
+}
+//Merge the selected cells 
+//by Huang Wei
+void CGridCtrl::MergeCells(int nStartRow, int nStartCol, int nEndRow, int nEndCol)
+{
+	for(int row=nStartRow;row<=nEndRow;row++)
 	{
-		m_arRowOrder[i] = i;	
+		for(int col=nStartCol;col<=nEndCol;col++)
+		{
+		    CGridCellBase *pCell = (CGridCellBase*) GetCell(row,col);
+			pCell->Show(false);
+			if(row==nStartRow && col==nStartCol)
+			{
+				CCellRange range(nStartRow,  nStartCol,  nEndRow,  nEndCol);
+				pCell->SetMergeRange(range);
+			}
+			else
+			{
+				CCellID cell(nStartRow,nStartCol);
+				pCell->SetMergeCellID(cell);
+			}
+
+		}
 	}
+	Invalidate();
 }
-
-
-void CGridCtrl::Reorder(int From, int To)
+//Merge the selected cells 
+//by Huang Wei
+void CGridCtrl::UnMergeSelectedCells()
 {
-		// Set line From just after Line To
-	ASSERT(From>= GetFixedRowCount() && To>=GetFixedRowCount()-1 && From<m_nRows && To<m_nRows);
-	int Value = m_arRowOrder[From];
-	m_arRowOrder.erase(m_arRowOrder.begin()+From);
-	int Offset = (From>=To ? 1:0);
-	m_arRowOrder.insert(m_arRowOrder.begin()+To+Offset, Value);
+	CCellRange range=GetSelectedCellRange();
+	UnMergeCells(range.GetMinRow(), range.GetMinCol(), range.GetMaxRow(), range.GetMaxCol());
+}
+//Merge the selected cells 
+//by Huang Wei
+void CGridCtrl::UnMergeCells(int nStartRow, int nStartCol, int nEndRow, int nEndCol)
+{
+	for(int row=nStartRow;row<=nEndRow;row++)
+	{
+		for(int col=nStartCol;col<=nEndCol;col++)
+		{
+		    CGridCellBase *pCell = (CGridCellBase*) GetCell(row,col);
+			if(pCell->IsMerged())
+			{
+				for(int mergerow=pCell->GetMergeRange().GetMaxRow();mergerow>=pCell->GetMergeRange().GetMinRow();mergerow--)
+					for(int mergecol=pCell->GetMergeRange().GetMaxCol();mergecol>=pCell->GetMergeRange().GetMinCol();mergecol--)
+					{
+						if(pCell->GetMergeRange().GetMaxRow()==-1 || pCell->GetMergeRange().GetMaxCol()==-1)
+							break;
+						CGridCellBase *pMergedCell = (CGridCellBase*) GetCell(mergerow,mergecol);
+						pMergedCell->UnMerge();
+					}
  
+			}
+			else
+				pCell->UnMerge();
+		}
+	}
+	Invalidate();
+}
+//Merge the selected cells 
+//by Huang Wei
+int  CGridCtrl::GetMergeCellWidth(CCellID cell)
+{
+	CCellID mergecell =GetMergeCellID(cell);
+    CGridCellBase *pCell = (CGridCellBase*) GetCell(mergecell);
+	if(!pCell->IsMerged())
+		return GetColumnWidth(cell.col);
+	int width=0;
+	for(int mergecol=pCell->GetMergeRange().GetMaxCol();mergecol>=pCell->GetMergeRange().GetMinCol();mergecol--)
+	{
+		width+=GetColumnWidth(mergecol);
+	}
+	return width;
+}
+//Merge the selected cells 
+//by Huang Wei
+int  CGridCtrl::GetMergeCellHeight(CCellID cell)
+{
+	CCellID mergecell =GetMergeCellID(cell);
+    CGridCellBase *pCell = (CGridCellBase*) GetCell(mergecell);
+	if(!pCell->IsMerged())
+		return GetRowHeight(cell.row);
+	int height=0;
+	for(int mergerow=pCell->GetMergeRange().GetMaxRow();mergerow>=pCell->GetMergeRange().GetMinRow();mergerow--)
+	{
+		height+=GetRowHeight(mergerow);
+	}
+	return height;
 }
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - main header
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -32,7 +32,6 @@
 #include "CellRange.h"
 #include "GridCell.h"
 #include <afxtempl.h>
-#include <vector>
  
  
 ///////////////////////////////////////////////////////////////////////////////////
@@ -181,8 +180,6 @@ class CGridCtrl;
 /////////////////////////////////////////////////////////////////////////////
 // CGridCtrl window
  
-typedef bool (*PVIRTUALCOMPARE)(int, int);
-
 class CGridCtrl : public CWnd
 {
     DECLARE_DYNCREATE(CGridCtrl)
@@ -537,6 +534,21 @@ public:
  
 // Implementation
 public:
+	//Merge the selected cells 
+	//by Huang Wei
+	CGridCellBase* GetCell(CCellID cell);
+	CCellID GetMergeCellID(CCellID cell);
+	void UnMergeSelectedCells();
+	void MergeSelectedCells();
+	void UnMergeCells(int nStartRow, int nStartCol, int nEndRow, int nEndCol);
+	void MergeCells(int nStartRow, int nStartCol, int nEndRow, int nEndCol);
+	int  GetMergeCellWidth(CCellID cell);
+	int  GetMergeCellHeight(CCellID cell);
+	BOOL GetCellOriginNoMerge(int nRow, int nCol, LPPOINT p);
+	BOOL GetCellOriginNoMerge(const CCellID& cell, LPPOINT p);
+
+
+
     virtual ~CGridCtrl();
  
 protected:
@@ -566,7 +578,6 @@ protected:
     CCellID GetTopleftNonFixedCell(BOOL bForceRecalculation = FALSE);
     CCellRange GetUnobstructedNonFixedCellRange(BOOL bForceRecalculation = FALSE);
     CCellRange GetVisibleNonFixedCellRange(LPRECT pRect = NULL, BOOL bForceRecalculation = FALSE);
-    CCellRange GetVisibleFixedCellRange(LPRECT pRect = NULL, BOOL bForceRecalculation = FALSE);
  
     BOOL IsVisibleVScroll() { return ( (m_nBarState & GVL_VERT) > 0); } 
     BOOL IsVisibleHScroll() { return ( (m_nBarState & GVL_HORZ) > 0); }
@@ -681,7 +692,7 @@ protected:
     CPoint      m_LeftClickDownPoint, m_LastMousePoint;
     CCellID     m_LeftClickDownCell, m_SelectionStartCell;
     CCellID     m_idCurrentCell, m_idTopLeftCell;
-    INT_PTR     m_nTimerID;
+    int         m_nTimerID;
     int         m_nTimerInterval;
     int         m_nResizeCaptureRange;
     BOOL        m_bAllowRowResize, m_bAllowColumnResize;
@@ -787,34 +798,6 @@ protected:
                        MOUSE_PREPARE_DRAG, MOUSE_DRAGGING
 #endif
     };
-//      for sort in virtual mode, and column order, save and load layer
-public:
-	typedef std::vector<int> intlist;
-	void Reorder(int From, int To);
-	void SetVirtualCompare(PVIRTUALCOMPARE VirtualCompare) { m_pfnVirtualCompare = VirtualCompare;}
-	int m_CurCol;
-	void AllowReorderColumn(bool b=true) { m_AllowReorderColumn = b;}
-	void EnableDragRowMode(bool b=true) { m_bDragRowMode = b; if(b) EnableDragAndDrop(); } // to change row order
-	int GetLayer(int** pLayer); //  gives back the number of ints of the area (do not forget to delete *pLayer)
-	void SetLayer(int* pLayer); // coming from a previous GetLayer (ignored if not same number of column, or the same revision number)
-	void ForceQuitFocusOnTab(bool b=true) { m_QuitFocusOnTab = b;} // use only if GetParent() is a CDialog
-	void AllowSelectRowInFixedCol(bool b=true) { m_AllowSelectRowInFixedCol = b;} // 
-//    allow acces?
-	intlist m_arRowOrder, m_arColOrder;
-	static CGridCtrl* m_This;
-protected:
-	virtual void AddSubVirtualRow(int Num, int Nb);
-	bool m_bDragRowMode;
-	int m_CurRow;
-private:
-	void ResetVirtualOrder();
-	PVIRTUALCOMPARE m_pfnVirtualCompare;
-	static bool NotVirtualCompare(int c1, int c2);
-	bool m_InDestructor;
-	bool m_AllowReorderColumn;
-	bool m_QuitFocusOnTab;
-	bool m_AllowSelectRowInFixedCol;
-
 };
  
 // Returns the default cell implementation for the given grid region
@@ -853,18 +836,12 @@ inline CGridCellBase* CGridCtrl::GetCell(int nRow, int nCol) const
         if (nRow < GetFixedRowCount())    gvdi.item.nState |= (GVIS_FIXED | GVIS_FIXEDROW);
         if (nCol < GetFixedColumnCount()) gvdi.item.nState |= (GVIS_FIXED | GVIS_FIXEDCOL);
         if (GetFocusCell() == CCellID(nRow, nCol)) gvdi.item.nState |= GVIS_FOCUSED;
-		if(!m_InDestructor)
-		{
-			gvdi.item.row = m_arRowOrder[nRow];
-			gvdi.item.col = m_arColOrder[nCol];
-
-			if (m_pfnCallback)
-				m_pfnCallback(&gvdi, m_lParam);
-			else
-				SendDisplayRequestToParent(&gvdi);
-			gvdi.item.row = nRow;        
-			gvdi.item.col = nCol;
-		}
+        
+        if (m_pfnCallback)
+            m_pfnCallback(&gvdi, m_lParam);
+        else
+            SendDisplayRequestToParent(&gvdi);
+
         static CGridCell cell;
         cell.SetState(gvdi.item.nState);
         cell.SetFormat(gvdi.item.nFormat);
@@ -882,7 +859,7 @@ inline CGridCellBase* CGridCtrl::GetCell(int nRow, int nCol) const
  
     GRID_ROW* pRow = m_RowData[nRow];
     if (!pRow) return NULL;
-    return pRow->GetAt(m_arColOrder[nCol]);
+    return pRow->GetAt(nCol);
 }
  
 inline BOOL CGridCtrl::SetCell(int nRow, int nCol, CGridCellBase* pCell)
@@ -6,8 +6,8 @@
 // is handle the drag and drop windows messages and pass them
 // directly onto the grid control.
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - Drag/Drop target implementation
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - inplace editing class
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2002. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
@@ -8,7 +8,7 @@
 //
  
 //////////////////////////////////////////////////
-// CGridMemDC - memory DC
+// CMemDC - memory DC
 //
 // Author: Keith Rule
 // Email:  keithr@europa.com
@@ -92,7 +92,7 @@ public:
  
 private:
     CBitmap  m_bitmap;      // Offscreen bitmap
-    CBitmap* m_pOldBitmap;  // bitmap originally found in CGridMemDC
+    CBitmap* m_pOldBitmap;  // bitmap originally found in CMemDC
     CDC*     m_pDC;         // Saves CDC passed in constructor
     CRect    m_rect;        // Rectangle of drawing area.
     BOOL     m_bMemDC;      // TRUE if CDC really is a Memory DC.
@@ -3,8 +3,8 @@
 //
 // MFC Grid Control - cell titletips
 //
-// Written by Chris Maunder <chris@codeproject.com>
-// Copyright (c) 1998-2005. All Rights Reserved.
+// Written by Chris Maunder <cmaunder@mail.com>
+// Copyright (c) 1998-2001. All Rights Reserved.
 //
 // This code may be used in compiled form in any way you desire. This
 // file may be redistributed unmodified by any means PROVIDING it is 
+// D:\GitProject\etradeclient\central_clearing_system\ETradeClient\mfc_ui\pay_dlg.cpp : 实现文件
+//
+
+#include "stdafx.h"
+#include "ETradeClient.h"
+#include "D:\GitProject\etradeclient\central_clearing_system\ETradeClient\mfc_ui\pay_dlg.h"
+#include "afxdialogex.h"
+
+
+// PayDlg 对话框
+
+IMPLEMENT_DYNAMIC(PayDlg, CDialogEx)
+
+PayDlg::PayDlg(CWnd* pParent /*=NULL*/)
+	: CDialogEx(PayDlg::IDD, pParent)
+{
+
+}
+
+PayDlg::~PayDlg()
+{
+}
+
+void PayDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialogEx::DoDataExchange(pDX);
+	DDX_Control(pDX, IDC_PAY_STATIC_TOTAL_MONEY, total_money_static_);
+	DDX_Control(pDX, IDC_PAY_STATIC_REAL_MONEY, real_money_static_);
+	DDX_Control(pDX, IDC_PAY_STATIC_PASSWORD, password_static_);
+	DDX_Control(pDX, IDC_PAY_EDIT_PASSWORD, password_edit_);
+	DDX_Control(pDX, IDC_PAY_BUTTON_PAY, pay_button_);
+	DDX_Control(pDX, IDC_PAY_BUTTON_CLOSE, close_button_);
+	DDX_Control(pDX, IDC_PAY_BUTTON_PASSWORD, password_button_);
+}
+
+
+BEGIN_MESSAGE_MAP(PayDlg, CDialogEx)
+	ON_BN_CLICKED(IDC_PAY_BUTTON_CLOSE, &PayDlg::OnBnClickedPayButtonClose)
+END_MESSAGE_MAP()
+
+
+// PayDlg 消息处理程序
+
+
+BOOL PayDlg::OnInitDialog()
+{
+	CDialogEx::OnInitDialog();
+
+	SetCtrlPos();
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// 异常:  OCX 属性页应返回 FALSE
+}
+
+void PayDlg::SetCtrlPos()
+{
+	const int StaticWidth = 80, StaticHeigth = 35;
+	const int EditWidth = 140, EditHeigth = 35;
+	const int EditWidthShort = 70, StaticWidthShort = 70;
+	const int ButtonWidth = 120, ButtonHeight = 40;
+
+	CRect ctrl_rect;
+	ctrl_rect.top = 30 + 10;
+	ctrl_rect.bottom = ctrl_rect.top + StaticHeigth;
+	ctrl_rect.left = 30;
+	ctrl_rect.right = ctrl_rect.left + StaticWidth;
+	total_money_static_.MoveWindow(&ctrl_rect);
+
+	ctrl_rect.left = ctrl_rect.right;
+	ctrl_rect.right += StaticWidth;
+	real_money_static_.MoveWindow(&ctrl_rect);
+
+	ctrl_rect.top = ctrl_rect.bottom + 30;
+	ctrl_rect.bottom = ctrl_rect.top + StaticHeigth;
+	ctrl_rect.left = 30;
+	ctrl_rect.right = ctrl_rect.left + StaticWidth;
+	password_static_.MoveWindow(ctrl_rect);
+
+	ctrl_rect.left = ctrl_rect.right;
+	ctrl_rect.right += EditWidth;
+	password_edit_.MoveWindow(&ctrl_rect);
+
+	ctrl_rect.left = ctrl_rect.right + 10;
+	ctrl_rect.right += ButtonWidth;
+	password_button_.MoveWindow(&ctrl_rect);
+
+	CRect dlg_rect;
+	GetClientRect(&dlg_rect);
+	ctrl_rect.bottom = dlg_rect.bottom;
+	ctrl_rect.top = ctrl_rect.bottom - ButtonHeight;
+	ctrl_rect.right = dlg_rect.right - 100;
+	ctrl_rect.left = ctrl_rect.right - ButtonWidth;
+	close_button_.MoveWindow(&ctrl_rect);
+
+	ctrl_rect.right = ctrl_rect.left - 100;
+	ctrl_rect.left = ctrl_rect.right - ButtonWidth;
+	pay_button_.MoveWindow(ctrl_rect);
+
+	CRect rect;
+	password_edit_.GetClientRect(&rect);
+	OffsetRect(&rect, 0, 10);
+	password_edit_.SendMessage(EM_SETRECT, 0, (LPARAM)&rect);
+
+	password_edit_.EnableWindow(FALSE);
+}
+
+void PayDlg::OnBnClickedPayButtonClose()
+{
+	CDialogEx::OnCancel();
+}
+#pragma once
+#include "afxwin.h"
+
+
+// PayDlg 对话框
+
+class PayDlg : public CDialogEx
+{
+	DECLARE_DYNAMIC(PayDlg)
+
+public:
+	PayDlg(CWnd* pParent = NULL);   // 标准构造函数
+	virtual ~PayDlg();
+
+// 对话框数据
+	enum { IDD = IDD_DIALOG_PAY };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 支持
+
+	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
+	CStatic total_money_static_;
+	CStatic real_money_static_;
+	CStatic password_static_;
+	CEdit password_edit_;
+	CButton pay_button_;
+	CButton close_button_;
+
+	void SetCtrlPos();
+	afx_msg void OnBnClickedPayButtonClose();
+	CButton password_button_;
+};
@@ -12,6 +12,8 @@
 #include "etradeclient/browser/session.h"
 #include "ETradeClient/utility/string_converter.h"
 #include "ETradeClient/utility/win_msg_define.h"
+#include <vector>
+#include "pay_dlg.h"
  
  
 // PlaceOrderDlg 对话框
@@ -23,15 +25,6 @@ PlaceOrderDlg::PlaceOrderDlg(CWnd* pParent /*=NULL*/)
 {
 	line_pen_.CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
 	edit_brush_.CreateSolidBrush(RGB(245, 247, 250));
-	/*error_count_ = 6;
-	card_num_ = ErrorCode;
-	card_name_ = ErrorCode;
-	comm_num_ = ErrorCode;
-	comm_name_ = ErrorCode;
-	unit_ = ErrorCode;
-	heavy_ = ErrorCode;
-	price_ = ErrorCode;
-	count_ = ErrorCode;*/
 }
  
 PlaceOrderDlg::~PlaceOrderDlg()
@@ -61,6 +54,10 @@ void PlaceOrderDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDC_STATIC_HEJI, total_money_static_);
 	DDX_Control(pDX, IDC_STATIC_TOTAL_MONEY, total_real_money_static_);
 	DDX_Control(pDX, IDC_STATIC_ERROR, error_static_);
+	DDX_Control(pDX, IDC_STATIC_BUYER, buyer_static_);
+	DDX_Control(pDX, IDC_EDIT_BUYER_CARD, buyer_card_edit_);
+	DDX_Control(pDX, IDC_EDIT_BUYER_NAME, buyer_name_edit_);
+	DDX_Control(pDX, IDC_BUTTON_SWIP_CARD, swip_card_button_);
 }
  
  
@@ -135,8 +132,32 @@ void PlaceOrderDlg::SetCtrlPos()
 	ctrl_rect.bottom = ctrl_rect.top + StaticHeigth;
 	ctrl_rect.left = 30;
 	ctrl_rect.right = ctrl_rect.left + StaticWidth;
+	buyer_static_.MoveWindow(ctrl_rect);
+
+	ctrl_rect.top -= 10;
+	ctrl_rect.left = ctrl_rect.right;
+	ctrl_rect.right += EditWidth;
+	buyer_card_edit_.MoveWindow(&ctrl_rect);
+
+	line_point_[3].x = ctrl_rect.right + 3;
+	line_point_[3].y = ctrl_rect.bottom - EditHeigth / 2 - 3;
+
+	ctrl_rect.left = ctrl_rect.right + 30;
+	ctrl_rect.right = ctrl_rect.left + EditWidth;
+	buyer_name_edit_.MoveWindow(&ctrl_rect);
+
+	const int ButtonWidth = 120, ButtonHeight = 40;
+	ctrl_rect.left = ctrl_rect.right + 30;
+	ctrl_rect.right = ctrl_rect.left + ButtonWidth;
+	swip_card_button_.MoveWindow(&ctrl_rect);
+
+
+	ctrl_rect.top = ctrl_rect.bottom + 30;
+	ctrl_rect.bottom = ctrl_rect.top + StaticHeigth;
+	ctrl_rect.left = 30;
+	ctrl_rect.right = ctrl_rect.left + StaticWidth;
 	owner_static_.MoveWindow(ctrl_rect);
-	ctrl_rect.top = 30;
+	ctrl_rect.top -= 10;
  
 	ctrl_rect.left = ctrl_rect.right;
 	ctrl_rect.right += EditWidth;
@@ -230,7 +251,7 @@ void PlaceOrderDlg::SetCtrlPos()
  
 	ctrl_rect.top = ctrl_rect.bottom + 5;
 	ctrl_rect.bottom = dlg_rect.bottom;
-	ctrl_rect.right = dlg_rect.right - TotalMoneyStaticWidth - 10;
+	ctrl_rect.right = dlg_rect.right - TotalMoneyStaticWidth - 100 - ButtonWidth;
 	ctrl_rect.left = ctrl_rect.right - TotalMoneyStaticWidth;
 	total_money_static_.MoveWindow(&ctrl_rect);
  
@@ -238,9 +259,6 @@ void PlaceOrderDlg::SetCtrlPos()
 	ctrl_rect.right = dlg_rect.right;
 	total_real_money_static_.MoveWindow(&ctrl_rect);
  
-	const int ButtonWidth = 120, ButtonHeight = 40;
-	ctrl_rect.top = 10;
-	ctrl_rect.bottom = ctrl_rect.top + ButtonHeight;
 	ctrl_rect.right = dlg_rect.right - 10;
 	ctrl_rect.left = ctrl_rect.right - ButtonWidth;
 	pay_button_.MoveWindow(&ctrl_rect);
@@ -280,6 +298,17 @@ void PlaceOrderDlg::SetCtrlPos()
 	count_edit_.GetClientRect(&rect);
 	OffsetRect(&rect, 0, 10);
 	count_edit_.SendMessage(EM_SETRECT, 0, (LPARAM)&rect);
+
+	buyer_card_edit_.GetClientRect(&rect);
+	OffsetRect(&rect, 0, 10);
+	buyer_card_edit_.SendMessage(EM_SETRECT, 0, (LPARAM)&rect);
+
+	buyer_name_edit_.GetClientRect(&rect);
+	OffsetRect(&rect, 0, 10);
+	buyer_name_edit_.SendMessage(EM_SETRECT, 0, (LPARAM)&rect);
+
+	buyer_card_edit_.EnableWindow(FALSE);
+	buyer_name_edit_.EnableWindow(FALSE);
 }
  
 void PlaceOrderDlg::OnPaint()
@@ -293,6 +322,9 @@ void PlaceOrderDlg::OnPaint()
 	dc.MoveTo(line_point_[1]);
 	dc.LineTo(line_point_[1].x + 24, line_point_[1].y);
  
+	dc.MoveTo(line_point_[3]);
+	dc.LineTo(line_point_[3].x + 24, line_point_[3].y);
+
 	dc.SelectObject(old_pen);
  
 	CDialogEx::OnPaint();
@@ -317,7 +349,8 @@ HBRUSH PlaceOrderDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
  
 void PlaceOrderDlg::OnBnClickedButtonPay()
 {
-	SetErrorMsg(CString(L"anniuanniu"));
+	PayDlg pay_dlg;
+	pay_dlg.DoModal();
 }
  
 void PlaceOrderDlg::InitList()
@@ -346,12 +379,12 @@ void PlaceOrderDlg::InitList()
  
 	product_list_.SetEditable(FALSE);
  
+	product_list_.SetFixedRowCount(1);
+	product_list_.SetFixedColumnCount(2);
  
 	product_list_.SetListMode(TRUE);
-	product_list_.SetSingleRowSelection(TRUE);
-
-	product_list_.SetFixedColumnCount(1);
-	product_list_.SetFixedColumnCount(2);
+	product_list_.SetSingleColSelection(TRUE);
+	product_list_.SetSingleRowSelection(FALSE);
  
 	product_list_.SetRowResize(FALSE);
 	product_list_.SetColumnResize(FALSE);
@@ -377,7 +410,12 @@ void PlaceOrderDlg::OnAcceleratorTab()
 }
 void PlaceOrderDlg::OnAcceleratorEnter()
 {
-	OnEditKillFocus(GetFocus()->GetDlgCtrlID(), NULL);
+	OnEditKillFocus(IDC_EDIT_CARD, NULL);
+	OnEditKillFocus(IDC_EDIT_COMM_NUM, NULL);
+	OnEditKillFocus(IDC_EDIT_UNIT, NULL);
+	OnEditKillFocus(IDC_EDIT_HEAVY, NULL);
+	OnEditKillFocus(IDC_EDIT_PRICE, NULL);
+	OnEditKillFocus(IDC_EDIT_COUNT, NULL);
  
 	do 
 	{
@@ -423,8 +461,22 @@ void PlaceOrderDlg::OnAcceleratorEnter()
 			product_list_.SetItemFormat(row_index, index, DT_CENTER | DT_VCENTER | DT_SINGLELINE);
 		}
  
-		product_list_.
-		
+		EmptyCtrl();
+		SortList();
+
+		CString subtotal;
+		double total_price = 0;
+		int list_count = product_list_.GetRowCount();
+		for (int index = 1; index <= count; ++index)
+		{
+			subtotal = product_list_.GetItemText(index, 7);
+			total_price += _ttof(subtotal);
+		}
+
+		CString total_price_s;
+		total_price_s.Format(L"%.2f", total_price);
+		total_real_money_static_.SetWindowText(total_price_s);
+
 	} while (0);
  
 	UpdateWindow();
@@ -530,6 +582,12 @@ LRESULT PlaceOrderDlg::OnEditKillFocus(WPARAM wParam, LPARAM lParam)
 		break;
 	}
 	case IDC_EDIT_HEAVY:
+	{
+		if (!heavy_edit_.IsWindowEnabled())
+		{
+			break;
+		}
+	}
 	case IDC_EDIT_PRICE:
 	case IDC_EDIT_COUNT:
 	{
@@ -690,3 +748,75 @@ void PlaceOrderDlg::OnSetFocus(CWnd* pOldWnd)
 	// TODO:  在此处添加消息处理程序代码
 }
  
+void PlaceOrderDlg::SortList()
+{
+	product_list_.SortItems(0, TRUE);
+
+
+	int row_count = product_list_.GetRowCount();
+	CString card_num, old_card_num;
+
+	struct CombineRange
+	{
+		int start_row;
+		int end_row;
+		struct CombineRange()
+		{
+			start_row = 0;
+			end_row = 0;
+		}
+
+		struct CombineRange(int start, int end)
+		{
+			start_row = start;
+			end_row = end;
+		};
+	};
+
+	std::vector<CombineRange> combine_list;
+	int start_row = 0, end_row = 0;
+	for (int index = 1; index <= row_count; ++index)
+	{
+		card_num = product_list_.GetItemText(index, 0);
+		if (card_num.Compare(old_card_num) == 0)
+		{
+			end_row++;
+		}
+		else
+		{
+			if (start_row != end_row)
+			{
+				combine_list.push_back(CombineRange(start_row, end_row));
+			}
+			old_card_num = card_num;
+			start_row = index;
+			end_row = start_row;
+		}
+	}
+
+	int combine_count = combine_list.size();
+	for (int index = 0; index < combine_count; ++index)
+	{
+		product_list_.MergeCells(combine_list[index].start_row, 0, combine_list[index].end_row, 0);
+		product_list_.MergeCells(combine_list[index].start_row, 1, combine_list[index].end_row, 1);
+	}
+
+	product_list_.Invalidate(TRUE);
+}
+
+void PlaceOrderDlg::EmptyCtrl()
+{
+	card_edit_.SetWindowText(L"8888");
+	name_edit_.SetWindowText(L"");
+	comm_num_edit_.SetWindowText(L"");
+	comm_name_edit_.SetWindowText(L"");
+	unit_edit_.SetWindowText(L"");;
+	real_unit_static.SetWindowText(L"斤");
+	heavy_edit_.SetWindowText(L"");
+	heavy_edit_.EnableWindow(FALSE);
+	price_edit_.SetWindowText(L"");
+	count_edit_.SetWindowText(L"");
+
+	card_edit_.SetFocus();
+	card_edit_.SetSel(4, 4);
+}
 \ No newline at end of file
@@ -59,7 +59,7 @@ public:
 	CGridCtrl product_list_;
  
 	CPen line_pen_;
-	CPoint line_point_[2];
+	CPoint line_point_[3];
  
 	CBrush edit_brush_;
 public:
@@ -89,20 +89,11 @@ public:
 	afx_msg void OnAcceleratorUp();
 	afx_msg void OnSetFocus(CWnd* pOldWnd);
  
-	//bool CheckCardData(CString card_data);
-	//bool CheckCommData(CString comm_data);
-	//bool CheckUnitData(CString unit_data);
-	//bool CheckPriceData(CString price_data);
-	//bool CheckCountData(CString count_data);
-
-	//CString card_num_;
-	//CString card_name_;
-	//CString comm_num_;
-	//CString comm_name_;
-	//CString unit_;
-	//CString heavy_;
-	//CString price_;
-	//CString count_;
-	//int error_count_;
-	//const CString ErrorCode = L"-9000";
+	void SortList();
+
+	void EmptyCtrl();
+	CStatic buyer_static_;
+	CEditBox buyer_card_edit_;
+	CEditBox buyer_name_edit_;
+	CButton swip_card_button_;
 };
@@ -15,6 +15,7 @@
 #define IDD_DIALOG_PLACE_ORDER          327
 #define IDR_MENU1                       329
 #define IDR_ACCELERATOR_ORDER           330
+#define IDD_DIALOG_PAY                  331
 #define IDC_USERNAME                    1000
 #define IDC_PWD                         1001
 #define IDC_ACCOUNT_EDIT                1002
@@ -36,6 +37,8 @@
 #define IDC_BUTTON1                     1019
 #define IDC_BUTTON_ERROR_ICO            1019
 #define IDC_BUTTON_PAY                  1019
+#define IDC_PAY_BUTTON_PASSWORD         1019
+#define IDC_BUTTON_SWIP_CARD            1022
 #define IDC_GRID_PRODUCT                1024
 #define IDC_EDIT_CARD                   1025
 #define IDC_EDIT_NAME                   1026
@@ -55,6 +58,16 @@
 #define IDC_STATIC_HEJI                 1042
 #define IDC_STATIC_TOTAL_MONEY          1043
 #define IDC_STATIC_ERROR                1046
+#define IDC_PAY_STATIC_TOTAL_MONEY      1047
+#define IDC_PAY_STATIC_MONEY            1048
+#define IDC_STATIC_BUYER                1049
+#define IDC_PAY_STATIC_PASSWORD         1049
+#define IDC_EDIT_BUYER_NAME             1050
+#define IDC_PAY_EDIT_PASSWORD           1050
+#define IDC_EDIT_BUYER_CARD             1051
+#define IDC_PAY_BUTTON_CLOSE            1051
+#define IDC_PAY_BUTTON_PAY              1052
+#define IDC_PAY_STATIC_REAL_MONEY       1053
 #define ID_PAY_FEE                      10001
 #define ID_ORDER                        10002
 #define ID_STATEMENT_MANAGE             10003
@@ -73,16 +86,15 @@
 #define ID_ACCELERATOR_TAB              32851
 #define ID_ACCELERATOR_ENTER            32852
 #define ID_ACCELERATOR_UP               32854
-#define ID_ACCELERATOR_LEFT             32855
 #define ID_ACCELERATOR_DOWN             32855
  
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        331
+#define _APS_NEXT_RESOURCE_VALUE        332
 #define _APS_NEXT_COMMAND_VALUE         32857
-#define _APS_NEXT_CONTROL_VALUE         1047
+#define _APS_NEXT_CONTROL_VALUE         1054
 #define _APS_NEXT_SYMED_VALUE           311
 #endif
 #endif