From 7a91c3a1ed37b0332d4ff0ebeae60bd6da3665c0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 16 七月 2024 18:28:58 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xcombobox.hpp | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/xcontrol/xcombobox.hpp b/jrj/xframe/xcontrol/xcombobox.hpp
index c831a1e..d7e5447 100644
--- a/jrj/xframe/xcontrol/xcombobox.hpp
+++ b/jrj/xframe/xcontrol/xcombobox.hpp
@@ -104,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;
@@ -126,7 +131,11 @@
return SendMessage(GetHWND(),CB_GETITEMDATA_,nIndex,0);
}
- int AddItem(string str, int p)
+ int AddItem(string str, KXMLDOMElement ele)
+ {
+ return AddItem(str, ele.ptr());
+ }
+ int AddItem(string str, LPARAM p)
{
int CB_ADDSTRING_ = 0x0143;
int h = SendMessage(GetHWND(),CB_ADDSTRING_ ,0,(LPARAM)str);
@@ -262,7 +271,7 @@
return SendMessage(hWnd, CB_GETITEMDATA_, nIndex, 0);
}
- static int AddItem(HWND hWnd,string str, int p)
+ static int AddItem(HWND hWnd,string str, LPARAM p)
{
int CB_ADDSTRING_ = 0x0143;
int h = SendMessage(hWnd, CB_ADDSTRING_, 0, (LPARAM)str);
--
Gitblit v1.9.3