From a8fb417ef1fb696723c8b8d5a340e8ca2e0312ae Mon Sep 17 00:00:00 2001 From: mrDarker <mr.darker@163.com> Date: 星期六, 09 八月 2025 10:43:17 +0800 Subject: [PATCH] Merge branch 'clh' into liuyang --- SourceCode/Bond/Servo/PageRecipe.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SourceCode/Bond/Servo/PageRecipe.h b/SourceCode/Bond/Servo/PageRecipe.h index 55baf65..9f24ba2 100644 --- a/SourceCode/Bond/Servo/PageRecipe.h +++ b/SourceCode/Bond/Servo/PageRecipe.h @@ -13,6 +13,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 +28,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); }; -- Gitblit v1.9.3