From 951f0d76ed2d8702963b4b1a233a5a5b4b69b502 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 08 七月 2024 16:39:43 +0800
Subject: [PATCH] update
---
jrj/project/business/Public/UserGroupShareEx.cpp | 4 ++--
jrj/xframe/wobject/xwin.hpp | 2 +-
jrj/ext-jrj/ext-jrj.vcxproj | 2 +-
jrj/ext-jrj/ext-jrj.vcxproj.filters | 12 ++++++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 61b985f..70cd3d4 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -422,7 +422,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupShareEx.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\quote.enquiry.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 9fbc2d0..6dfaac8 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -330,6 +330,12 @@
<ClInclude Include="..\xframe\xcontrol\xlistview.hpp">
<Filter>澶存枃浠�</Filter>
</ClInclude>
+ <ClInclude Include="..\xframe\kobject\koffice.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\xcontrol\xoffice.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -638,5 +644,11 @@
<ClCompile Include="..\project\business\Public\UserGroupShareEx.cpp">
<Filter>project\business\Public</Filter>
</ClCompile>
+ <ClCompile Include="..\project\analysis\DataVanalysisWin.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\total3\ViewTotalWin.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/Public/UserGroupShareEx.cpp b/jrj/project/business/Public/UserGroupShareEx.cpp
index 64a292b..6e253ed 100644
--- a/jrj/project/business/Public/UserGroupShareEx.cpp
+++ b/jrj/project/business/Public/UserGroupShareEx.cpp
@@ -52,10 +52,10 @@
xaserverarg arg = GetArg();
arg.AddArg(L"process", L"ok");
- xml x = xml::Make();
+ xml x;
dw_list.DwUpdateAllToEx(x);
arg.AddArg(L"result", x.xml());
- x.Free();
+
CloseWindow();
return 1;
}
diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index 3a21359..83ebe7a 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -67,7 +67,7 @@
return getKWin()->AttachEvent((LPTSTR)msg,*(Hxsoft::XFrame::FEvent*)&fnEvt,this);
}
- kcontrol* GetControl(const wchar_t* ctrlname)
+ kcontrol* xcontrol(const wchar_t* ctrlname)
{
return getKWin()->GetControl(ctrlname);
}
--
Gitblit v1.9.3