From abf4b5dc24ce08d0b96da1bef2b283a7987185eb Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 11:19:26 +0800
Subject: [PATCH] update menu
---
jrj/project/vindexform.cpp | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 931a291..1604f3f 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -103,9 +103,8 @@
if (!hMenu)
{
HWND hw = m_hMenu;
- bool f = IsWindow(hw);
-
- if (hw == 0 && f <= 0)
+ bool bwin = hw ? IsWindow(hw):false;
+ if (!bwin)
{
xaserverarg* arg = new xaserverarg();
HWND hWnd = GetHWND();
@@ -256,9 +255,16 @@
int ResetMenu()
{
+ ::DestroyWindow(m_hMenu);
+ m_hMenu = 0;
+ return 1;
+
//if(m_nHwnd) xwin::CloseWindow(m_nHwnd);
m_nHwnd = 0;
+ OnMenu(NULL);
+ OnMenuAgent(L"");
+#if 0
menuShow = -1;
xstring f = getHomeConfig(L"menuposition");
if (f == L"0")
@@ -267,6 +273,7 @@
OnMenuAgent(L"");
}
+
xaserverarg arg;
HWND h = GetHWND();
@@ -274,7 +281,7 @@
arg.SetParam(L"hwnd", h);
OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
-
+#endif
return 1;
}
@@ -316,7 +323,7 @@
if (m_Assignment == L"")
alert(L"鑾峰彇鐢ㄦ埛鏁版嵁澶辫触锛岃閲嶆柊鐧诲綍!");
else
- xaserver::SetUID((LPWSTR)m_Assignment.c_str());
+ xaserver::SetUID((LPWSTR)m_Assignment.c_str(true));
xcombobox::AddItem(cbx_menu.GetHWND(), L"寮�濮�");
xcombobox::AddItem(cbx_tab.GetHWND(), L"-1");
@@ -612,7 +619,7 @@
if((xstring)m_Assignment == L"")
alert(L"鑾峰彇鐢ㄦ埛鏁版嵁澶辫触锛岃閲嶆柊鐧诲綍!");
else
- xaserver::SetUID((LPWSTR)m_Assignment.c_str());
+ xaserver::SetUID((LPWSTR)m_Assignment.c_str(true));
return 1;
}
--
Gitblit v1.9.3