From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期三, 27 八月 2025 13:47:31 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/PageRecipe.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 55baf65..6833e3b 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -1,6 +1,7 @@ 锘�#pragma once #include "afxdialogex.h" #include "RecipeManager.h" +#include "ListCtrlEx.h" // CPageRecipe 瀵硅瘽妗� @@ -13,6 +14,9 @@ virtual ~CPageRecipe(); private: + void InitListCtrlHeaderForMaster(); + void InitListCtrlHeaderForDevice(); + void UpdateRecipeByPPID(const CString& strPPID); void FillDataToListCtrl(const std::vector<RecipeInfo>& vecRecipe); void FillRecipeListToListCtrl(SERVO::CRecipeList* pList); @@ -25,18 +29,18 @@ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔 virtual BOOL OnInitDialog(); afx_msg void OnSize(UINT nType, int cx, int cy); + afx_msg void OnDestroy(); + afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); + afx_msg void OnBnClickedButtonNew(); afx_msg void OnBnClickedButtonSearch(); afx_msg void OnBnClickedButtonModify(); afx_msg void OnBnClickedButtonDelete(); afx_msg void OnBnClickedButtonDeleteAll(); afx_msg void OnBnClickedButtonRefresh(); afx_msg void OnLvnItemChangedListPPID(NMHDR* pNMHDR, LRESULT* pResult); + afx_msg void OnCbnSelchangeComboEquipment(); DECLARE_MESSAGE_MAP() private: - CListCtrl m_listPPID; -public: - afx_msg void OnDestroy(); - afx_msg void OnCbnSelchangeComboEquipment(); - afx_msg void OnShowWindow(BOOL bShow, UINT nStatus); + CListCtrlEx m_listPPID; }; -- Gitblit v1.9.3