From 00e49b7a6bcb68189ef0b6cfe8ee20c1a479579d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 24 七月 2024 16:20:00 +0800
Subject: [PATCH] update
---
jrj/project/vindexform.cpp | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 50 deletions(-)
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 8d41e92..199aa6b 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -16,20 +16,15 @@
class __declspec(dllexport) vindexform: public xwin
{
public:
- string m_Assignment;
+ xstring m_Assignment;
HWND m_hMenu;
xlayersheet mainsheet;
- xcombobox cbx_menu;
- xcombobox cbx_panelName;
- xcombobox cbx_panelNo;
- xcombobox cbx_tab;
+ xcombobox cbx_menu; //椤电鏁扮粍
+ xcombobox cbx_panelName; //椤电椤哄簭鏁扮粍
+ xcombobox cbx_panelNo; //椤电鏁扮粍
+ xcombobox cbx_tab; //椤电椤哄簭鏁扮粍
- xcombobox memuId; //椤电鏁扮粍
- xcombobox tabNo; //椤电椤哄簭鏁扮粍
- xcombobox panelNo; //椤电鏁扮粍
- xcombobox panelName; //椤电椤哄簭鏁扮粍
-
HWND m_npHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
HWND m_nHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
int m_cursheet; //褰撳墠椤电
@@ -76,16 +71,19 @@
else
{
KXMLDOMElement e = x.documentElement();
- if (e.selectSingleNode(L"home"))
+ if (e)
{
- KXMLDOMElement e1 = e.selectSingleNode(L"home");
- e1.setAttribute(att, value);
- }
- else
- {
- KXMLDOMElement e2 = x.createElement(L"home");
- e2.setAttribute(att, value);
- e.appendChild(e2);
+ if (e.selectSingleNode(L"home"))
+ {
+ KXMLDOMElement e1 = e.selectSingleNode(L"home");
+ e1.setAttribute(att, value);
+ }
+ else
+ {
+ KXMLDOMElement e2 = x.createElement(L"home");
+ e2.setAttribute(att, value);
+ e.appendChild(e2);
+ }
}
//alert(e.xml);
}
@@ -105,17 +103,16 @@
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();
arg->SetParam(L"hwnd", (LPARAM)hWnd);
- arg->SetParam(L"memuId", (LPARAM)cbx_menu.getNativePointer());
- arg->SetParam(L"tabNo", (LPARAM)cbx_tab.getNativePointer());
- arg->SetParam(L"panelNo", (LPARAM)cbx_panelNo.getNativePointer());
- arg->SetParam(L"panelName", (LPARAM)cbx_panelName.getNativePointer());
+ arg->SetParam(L"cbx_menu", (LPARAM)cbx_menu.getNativePointer());
+ arg->SetParam(L"cbx_tab", (LPARAM)cbx_tab.getNativePointer());
+ arg->SetParam(L"cbx_panelNo", (LPARAM)cbx_panelNo.getNativePointer());
+ arg->SetParam(L"cbx_panelName", (LPARAM)cbx_panelName.getNativePointer());
xwin* pwin = OpenWindow(L"dev:xpage[vindexmenu.vx]", (LPARAM)arg);
m_hMenu = pwin->GetHWND();
hw = m_hMenu;
@@ -162,8 +159,8 @@
xaserverarg* arg = new xaserverarg();
HWND hWnd = GetHWND();
arg->SetParam(L"hwnd", (LPARAM)hWnd);
- arg->SetParam(L"memuId", (LPARAM)cbx_menu.getNativePointer());
- arg->SetParam(L"tabNo", (LPARAM)cbx_tab.getNativePointer());
+ arg->SetParam(L"cbx_menu", (LPARAM)cbx_menu.getNativePointer());
+ arg->SetParam(L"cbx_tab", (LPARAM)cbx_tab.getNativePointer());
arg->SetParam(L"panelNo", (LPARAM)cbx_panelNo.getNativePointer());
arg->SetParam(L"panelName", (LPARAM)cbx_panelName.getNativePointer());
xwin* pwin=OpenWindow(L"dev:xpage[vindexmenu.vx]", (LPARAM)arg);
@@ -250,7 +247,7 @@
OnMenu(NULL);
}
menuShow = -1 - isshow;
- xcombobox::SetCurSel(memuId.GetHWND(), menuShow);
+ cbx_menu.SetCurSel(menuShow);
if (f != L"")
setHomeConfig(L"menuposition", xstring(menuShow));
return 1;
@@ -258,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")
@@ -269,6 +273,7 @@
OnMenuAgent(L"");
}
+
xaserverarg arg;
HWND h = GetHWND();
@@ -276,17 +281,17 @@
arg.SetParam(L"hwnd", h);
OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
-
+#endif
return 1;
}
int ReSetInfo()
{
- memuId.ResetContent();
- tabNo.ResetContent();
- panelNo.ResetContent();
- panelName.ResetContent();
+ cbx_menu.ResetContent();
+ cbx_tab.ResetContent();
+ cbx_panelNo.ResetContent();
+ cbx_panelName.ResetContent();
int hItem = mainsheet.GetSheetCount();
while (hItem > 1)
@@ -318,10 +323,10 @@
if (m_Assignment == L"")
alert(L"鑾峰彇鐢ㄦ埛鏁版嵁澶辫触锛岃閲嶆柊鐧诲綍!");
else
- xaserver::SetUID((LPWSTR)m_Assignment);
+ xaserver::SetUID((LPWSTR)m_Assignment.c_str(true));
- xcombobox::AddItem(memuId.GetHWND(), L"寮�濮�");
- xcombobox::AddItem(tabNo.GetHWND(), L"-1");
+ xcombobox::AddItem(cbx_menu.GetHWND(), L"寮�濮�");
+ xcombobox::AddItem(cbx_tab.GetHWND(), L"-1");
//OpenWindow(L"dev:xpage[vstart.vx]");
xcontrol xc = GetControl(L"statusbar0");
xc.SetText(L"姝ｅ湪鍒濆鍖栫郴缁燂紝璇风◢鍊�....");
@@ -401,11 +406,11 @@
int MF_CHECKED = 0x8;
int k = mainsheet.GetSheetIndex();
- //int cs = xcombobox::GetCount(memuId.GetId());
+ //int cs = xcombobox::GetCount(cbx_menu.GetId());
int cs = mainsheet.GetSheetCount();
int i;
for (i = 0; i < cs; i++) {
- //string str = xcombobox::GetLBText(memuId.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);
@@ -545,27 +550,27 @@
int sheet = nmtv.nSheet;
int s = mainsheet.GetSheetCount();
//trace(s);
- int cs = xcombobox::GetCount(memuId.GetHWND());
+ int cs = xcombobox::GetCount(cbx_menu.GetHWND());
int cursheet = m_cursheet;
if (s > cs) {
- xcombobox::AddItem(memuId.GetHWND(), L"鑷敱绐楀彛");
- xcombobox::AddItem(tabNo.GetHWND(), xstring(cursheet));
+ xcombobox::AddItem(cbx_menu.GetHWND(), L"鑷敱绐楀彛");
+ xcombobox::AddItem(cbx_tab.GetHWND(), xstring(cursheet));
}
if (s < cs) {
- xcombobox::DeleteItem(memuId.GetHWND(), cursheet);
+ xcombobox::DeleteItem(cbx_menu.GetHWND(), cursheet);
int i = 0;
- xstring value = xcombobox::GetLBText(tabNo.GetHWND(), cursheet);
+ xstring value = xcombobox::GetLBText(cbx_tab.GetHWND(), cursheet);
for (i = 0; i < cs; i++)
{
- xstring tabId = xcombobox::GetLBText(tabNo.GetHWND(), i);
+ xstring tabId = xcombobox::GetLBText(cbx_tab.GetHWND(), i);
if (tabId == xstring(cursheet))
{
- xcombobox::DeleteItem(tabNo.GetHWND(), i);
- xcombobox::InsertString(tabNo.GetHWND(), i, value);
+ xcombobox::DeleteItem(cbx_tab.GetHWND(), i);
+ xcombobox::InsertString(cbx_tab.GetHWND(), i, value);
}
}
- xcombobox::DeleteItem(tabNo.GetHWND(), cursheet);
+ xcombobox::DeleteItem(cbx_tab.GetHWND(), cursheet);
if (sheet != value.toInt())
mainsheet.SelectSheet(value.toInt());
}
@@ -607,14 +612,14 @@
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;
}
if((xstring)m_Assignment == L"")
alert(L"鑾峰彇鐢ㄦ埛鏁版嵁澶辫触锛岃閲嶆柊鐧诲綍!");
else
- xaserver::SetUID((LPWSTR)m_Assignment);
+ xaserver::SetUID((LPWSTR)m_Assignment.c_str(true));
return 1;
}
--
Gitblit v1.9.3