From bcfe0d245aaa5ac4779df10156d5e7000485e2a9 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 02 七月 2024 11:23:25 +0800
Subject: [PATCH] update face
---
jrj/project/vindexform.cpp | 37 +++++++++---------
jrj/project/vindexformex.cpp | 49 ------------------------
2 files changed, 19 insertions(+), 67 deletions(-)
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index a229ce7..7718d19 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -28,12 +28,12 @@
xcombobox panelNo; //椤电鏁扮粍
xcombobox panelName; //椤电椤哄簭鏁扮粍
- int m_npHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
- int m_nHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
+ HWND m_npHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
+ HWND m_nHwnd; //鑿滃崟鏍戠獥鍙ｅ彞鏌�
int m_cursheet; //褰撳墠椤电
int menuShow;
- int m_npHwnd2; //openwindow
+ HWND m_npHwnd2; //openwindow
int m_startwin;
public:
@@ -148,17 +148,17 @@
}
int OnMenuAgent(xstring f)
{
- int LayerFlow_None = 0x00000001;
- int LayerFlow_UnLayer = 0x00000100;
- int LayerFlow_NS = 0x00000004;
- int LayerFlow_Control = 0x00000010;
+ //int LayerFlow_None = 0x00000001;
+ //int LayerFlow_UnLayer = 0x00000100;
+ //int LayerFlow_NS = 0x00000004;
+ //int LayerFlow_Control = 0x00000010;
int GWL_STYLE = -16;
int WS_POPUP = 0x80000000;
int WS_CHILD = 0x40000000;
int WS_MAXIMIZE = 0x00010000;
int SW_MAXIMIZE = 3;
- int HWND_TOPMOST = -1;
- int HWND_NOTOPMOST = -2;
+ HWND HWND_TOPMOST = (HWND) - 1;
+ HWND HWND_NOTOPMOST = (HWND) - 2;
int SWP_NOSIZE = 0x0001;
int SWP_NOMOVE = 0x0002;
int SWP_SHOWWINDOW = 0x0040;
@@ -174,12 +174,12 @@
style = style - WS_POPUP;
style = style + WS_CHILD;
- xwin::SetWindowLong(m_nHwnd, GWL_STYLE, style);
+ SetWindowLong(m_nHwnd, GWL_STYLE, style);
- m_npHwnd = xwin::GetParent(m_nHwnd);
+ m_npHwnd = GetParent(m_nHwnd);
xcontrol xc = GetControl(L"menuAgent");
- xwin::SetParent(m_nHwnd, xc.GetId());
- xwin::ShowWindow(m_nHwnd, SW_MAXIMIZE);
+ SetParent(m_nHwnd, xc.GetHWND());
+ ShowWindow(m_nHwnd, SW_MAXIMIZE);
///AttachEvent(L"WM_SIZE",OnMenuSizeChanged);
//AttachEvent(L"WM_PAINT",OnMenuSizeChanged);
@@ -212,14 +212,15 @@
xstring f = getHomeConfig(L"menuposition");
if (f == L"0")
{
- OnMenu(L"");
+ OnMenu(NULL);
OnMenuAgent(L"");
}
xaserverarg arg;
- int h = GetHWND();
- arg.AddArg(L"hwnd", xstring(h));
+ HWND h = GetHWND();
+ //arg.AddArg(L"hwnd", xstring(h));
+ arg.SetParam(L"hwnd", h);
OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
@@ -229,7 +230,7 @@
int ReSetInfo()
{
- xcombobox::ResetContent(memuId.GetId());
+ cbx_menu.ResetContent();
xcombobox::ResetContent(tabNo.GetId());
xcombobox::ResetContent(panelNo.GetId());
xcombobox::ResetContent(panelName.GetId());
@@ -264,7 +265,7 @@
if (m_Assignment == L"")
alert(L"鑾峰彇鐢ㄦ埛鏁版嵁澶辫触锛岃閲嶆柊鐧诲綍!");
else
- xaserver::SetUserId(m_Assignment);
+ xaserver::SetUID(m_Assignment);
xcombobox::AddItem(memuId.GetId(), L"寮�濮�");
xcombobox::AddItem(tabNo.GetId(), L"-1");
diff --git a/jrj/project/vindexformex.cpp b/jrj/project/vindexformex.cpp
index 54b3cf1..82614c3 100644
--- a/jrj/project/vindexformex.cpp
+++ b/jrj/project/vindexformex.cpp
@@ -28,55 +28,6 @@
{
return new vindexformex(implPtr,(HWND)hWnd);
}
-
- string getHomeConfig(string att)
- {
- xml x = new xml;
- x.setNativePointer(xml::CreateInstance());
- x.Load("cache\\config.xml");
- //alert(x.GetXml());
- if (x.GetXml() == "") return "";
- msxml::IXMLDOMElement e = x.GetXmlDoc().documentElement;
- if (e.selectSingleNode("home"))
- {
- msxml::IXMLDOMElement e1 = e.selectSingleNode("home");
- if (e1.selectSingleNode("@" + att))
- return e1.selectSingleNode("@" + att).text;
- }
- return "";
- }
-
- int setHomeConfig(string att, string value)
- {
- xml x = new xml;
- x.setNativePointer(xml::CreateInstance());
- x.Load("cache\\config.xml");
- if (x.GetXml() == "")
- {
- //alert("<config><home "+att+"="+value+"/></config>");
- x.LoadXml("<config><home " + att + "='" + value + "'/></config>");
- }
- else
- {
- msxml::IXMLDOMElement e = x.GetXmlDoc().documentElement;
- if (e.selectSingleNode("home"))
- {
- msxml::IXMLDOMElement e1 = e.selectSingleNode("home");
- e1.setAttribute(att, value);
- }
- else
- {
- msxml::IXMLDOMElement e2 = x.GetXmlDoc().createElement("home");
- e2.setAttribute(att, value);
- e.appendChild(e2);
- }
- //alert(e.xml);
- }
- //alert(x.GetXml());
- xutil::SaveToFile("cache\\config.xml", x.GetXml(), "", "", "");
- return 1;
- }
-
public:
int OnDWClick(TEvent* evt, int p)
{
--
Gitblit v1.9.3