From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
Internal_Library/Include/CHCommonControls/GridCellBase.h | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/Internal_Library/Include/CHCommonControls/GridCellBase.h b/Internal_Library/Include/CHCommonControls/GridCellBase.h
index 6f181bd..957f7df 100644
--- a/Internal_Library/Include/CHCommonControls/GridCellBase.h
+++ b/Internal_Library/Include/CHCommonControls/GridCellBase.h
@@ -28,6 +28,7 @@
#if _MSC_VER >= 1000
#pragma once
#endif // _MSC_VER >= 1000
+#include "CellRange.h"
class CGridCtrl;
@@ -127,10 +128,13 @@
// Operators
public:
- virtual void operator=(const CGridCellBase& cell);
+ virtual void operator=(CGridCellBase& cell);
// Operations
public:
+ virtual bool IsMerged();
+ virtual void SetMergeRange(CCellRange range);
+ virtual void Show(bool IsShow);
virtual void Reset();
virtual BOOL Draw(CDC* pDC, int nRow, int nCol, CRect rect, BOOL bEraseBkgnd = TRUE);
@@ -162,8 +166,21 @@
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}}
--
Gitblit v1.9.3