From 9ab768f94cecdcec13c22e7d70e9fd8a18afef53 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 23 七月 2024 17:41:43 +0800
Subject: [PATCH] update
---
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 83c3905..199aa6b 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;
}
@@ -403,7 +410,7 @@
int cs = mainsheet.GetSheetCount();
int i;
for (i = 0; i < cs; i++) {
- //string str = xcombobox::GetLBText(cbx_menu.GetId(), i);
+ //xstring str = xcombobox::GetLBText(cbx_menu.GetId(), i);
xstring str = mainsheet.GetSheetText(i);
if (i == k)
AppendMenu(m, MF_STRING | MF_CHECKED, i + 1, str);
@@ -605,7 +612,7 @@
Hxsoft::XFrame::KXMLDOMElement e = x.documentElement();
if((xstring)m_Assignment == L"" && e.selectSingleNode(L"AssignmentID"))
{
- string sInfoEx = e.selectSingleNode(L"AssignmentID").text();
+ xstring sInfoEx = e.selectSingleNode(L"AssignmentID").text();
m_Assignment = sInfoEx;
}
--
Gitblit v1.9.3