From 78affdc74a7b86df8a1f07311741f84942ef7944 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 11 七月 2024 22:21:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xcombobox.hpp | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/xcontrol/xcombobox.hpp b/jrj/xframe/xcontrol/xcombobox.hpp
index 4b7cafd..ca9a725 100644
--- a/jrj/xframe/xcontrol/xcombobox.hpp
+++ b/jrj/xframe/xcontrol/xcombobox.hpp
@@ -16,11 +16,6 @@
return *this;
}
public:
- static int GetCurSel(HWND hWnd)
- {
- int CB_GETCURSEL_ = 0x0147;
- return SendMessage(hWnd, CB_GETCURSEL_, 0, 0);
- }
int GetCurSel()
{
@@ -109,6 +104,11 @@
return SendMessage(GetHWND(),CB_RESETCONTENT_,0,0);
}
+ int SetItemData(int nIndex, KXMLDOMElement p)
+ {
+ return SetItemData(nIndex, p.ptr());
+ }
+
int SetItemData(int nIndex, LPARAM p)
{
int CB_SETITEMDATA_ = 0x0151;
@@ -131,7 +131,11 @@
return SendMessage(GetHWND(),CB_GETITEMDATA_,nIndex,0);
}
- int AddItem(string str, int p)
+ int AddItem(string str, KXMLDOMElement ele)
+ {
+ AddItem(str, ele.ptr());
+ }
+ int AddItem(string str, LPARAM p)
{
int CB_ADDSTRING_ = 0x0143;
int h = SendMessage(GetHWND(),CB_ADDSTRING_ ,0,(LPARAM)str);
--
Gitblit v1.9.3