From 28b19397534f1ad6eabfc1e7bfaf46a2ce6df39e Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 17 十二月 2024 12:42:52 +0800
Subject: [PATCH] update
---
jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
index 09867d7..bc2201d 100644
--- a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
+++ b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp
@@ -15,8 +15,8 @@
public:
ximageview im;
xml doc;
- int m_winHwnd;
- int ParentHWND;
+ HWND m_winHwnd;
+ HWND ParentHWND;
public:
SKUProductPictureView3(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
public:
@@ -29,19 +29,19 @@
{
//xnode anode = GetAgentNode(name);
xnode anode = GetAgentNode(name);
- int LayerFlow_None = 0x00000001;
- int LayerFlow_UnLayer = 0x00000100;
- int LayerFlow_NS = 0x00000004;
- int LayerFlow_WE = 0x00000008;
- int LayerFlow_Control = 0x00000010;
+ int LayerFlow_None_ = 0x00000001;
+ int LayerFlow_UnLayer_ = 0x00000100;
+ int LayerFlow_NS_ = 0x00000004;
+ int LayerFlow_WE_ = 0x00000008;
+ int LayerFlow_Control_ = 0x00000010;
if (f)
- anode.SetLayerFlow(LayerFlow_WE | LayerFlow_Control);
+ anode.SetLayerFlow(LayerFlow_WE_ | LayerFlow_Control_);
else
- anode.SetLayerFlow(LayerFlow_None | LayerFlow_UnLayer);
+ anode.SetLayerFlow(LayerFlow_None_ | LayerFlow_UnLayer_);
return 1;
}
- int OnImgDBClicked(TEvent* evt, int pr)
+ int OnImgDBClicked(TEvent* evt, LPARAM pr)
{
IMGNNMHDR& nmtv = *(IMGNNMHDR*)evt->notify.pnmh;
xstring src = nmtv.path;
@@ -50,14 +50,14 @@
else
src=src.mid(src.find(L"Thumbs", 0)+6, 50);
*/
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
//arg.AddArg(L"src",L"/business/products/chanpin"+src);
arg.AddArg(L"src", src);
//win::OpenWindow(L"dev:xpage[BigPicture.vx]",arg);
- int h = openUrl(L"/sale/view/ProductLibrary/xpage/bigpictureview", &arg);
+ int h = openUrl(L"/sale/view/ProductLibrary/xpage/bigpictureview", arg);
return 1;
/*xwin x = new xwin;
@@ -108,15 +108,14 @@
}
else if (comdid == L"xmDelete")
{
- int hh = ParentHWND;
- if (hh > 0)
+ if (ParentHWND)
{
int nIndex = im.GetSelectIndex();
if (nIndex < 0 || nIndex >= im.GetImageCount()) return 0;
im.RemoveImage(nIndex);
im.Redraw();
xstring comd = L"Delete:" +xstring(nIndex);
- SendMessage(hh, 0x401, comd, 0);
+ SendMessage(ParentHWND, 0x401, (WPARAM)comd.c_str(), 0);
}
}
return 0;
@@ -176,11 +175,8 @@
if (GetWinParam())
{
- xaserverarg arg;
- //
- arg = GetArg();
- xstring hh = arg.GetArgString(L"ParentHWND");
- ParentHWND = hh.toInt();
+ xaserverarg arg = GetArg();
+ ParentHWND = (HWND)arg.GetParam(L"ParentHWND");
xstring openflag = arg.GetArgString(L"OpenFlag");
//alert(openflag);
if (openflag != L"0") hiddenBox(L"xmDelete", false);
@@ -195,7 +191,7 @@
return 0;
}
doc = x;
- //alert(x.GetXml());
+ //alert(x.xml());
KXMLDOMElement e = x.selectSingleNode(L"ImageList");
KXMLDOMNodeList nlist = e.selectNodes(L"image");
int i;
@@ -218,7 +214,7 @@
im.AddImages(L"/business/products/chanpin/BL-002/417884.jpg", L"x3");
im.Redraw();
}
- win32::SetFocus(im.GetId());
+ SetFocus(im.GetHWND());
xstring userno = xaserver::GetUserNo();
/*if(userno == L"1003" || userno == L"1137" || userno == L"admin") {
--
Gitblit v1.9.3