From a660be8441928b8c6d51a2212bcaace358f8ca82 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/xcontrol/xcombobox.hpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/xcontrol/xcombobox.hpp b/jrj/xframe/xcontrol/xcombobox.hpp
index ca9a725..d7e5447 100644
--- a/jrj/xframe/xcontrol/xcombobox.hpp
+++ b/jrj/xframe/xcontrol/xcombobox.hpp
@@ -133,7 +133,7 @@
int AddItem(string str, KXMLDOMElement ele)
{
- AddItem(str, ele.ptr());
+ return AddItem(str, ele.ptr());
}
int AddItem(string str, LPARAM p)
{
@@ -271,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