From e5d246e3def64dc03761bbc5e330bdf260739145 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 16 九月 2024 10:00:26 +0800
Subject: [PATCH] update
---
jrj/ext-jrj/JAlloc.cpp | 1
jrj/ext-jrj/JPlatform.hpp | 5 ++
jrj/ext-jrj/JLang.hpp | 5 ++
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 4 +-
jrj/ext-jrj/JScript.cpp | 1
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 2
jrj/ext-jrj/JAlloc.hpp | 5 ++
jrj/ext-jrj/ext-jrj.vcxproj | 8 ++++
jrj/ext-jrj/JScript.hpp | 5 ++
jrj/ext-jrj/JPlatform.cpp | 1
jrj/ext-jrj/JLang.cpp | 1
jrj/ext-jrj/ext-jrj.vcxproj.filters | 66 ++++++++++++++++++++++----------
12 files changed, 80 insertions(+), 24 deletions(-)
diff --git a/jrj/ext-jrj/JAlloc.cpp b/jrj/ext-jrj/JAlloc.cpp
new file mode 100644
index 0000000..39d169d
--- /dev/null
+++ b/jrj/ext-jrj/JAlloc.cpp
@@ -0,0 +1 @@
+#include "JAlloc.hpp"
diff --git a/jrj/ext-jrj/JAlloc.hpp b/jrj/ext-jrj/JAlloc.hpp
new file mode 100644
index 0000000..05866bf
--- /dev/null
+++ b/jrj/ext-jrj/JAlloc.hpp
@@ -0,0 +1,5 @@
+#pragma once
+class JAlloc
+{
+};
+
diff --git a/jrj/ext-jrj/JLang.cpp b/jrj/ext-jrj/JLang.cpp
new file mode 100644
index 0000000..d481634
--- /dev/null
+++ b/jrj/ext-jrj/JLang.cpp
@@ -0,0 +1 @@
+#include "JLang.hpp"
diff --git a/jrj/ext-jrj/JLang.hpp b/jrj/ext-jrj/JLang.hpp
new file mode 100644
index 0000000..ca74b06
--- /dev/null
+++ b/jrj/ext-jrj/JLang.hpp
@@ -0,0 +1,5 @@
+#pragma once
+class JLang
+{
+};
+
diff --git a/jrj/ext-jrj/JPlatform.cpp b/jrj/ext-jrj/JPlatform.cpp
new file mode 100644
index 0000000..cb9ed5e
--- /dev/null
+++ b/jrj/ext-jrj/JPlatform.cpp
@@ -0,0 +1 @@
+#include "JPlatform.hpp"
diff --git a/jrj/ext-jrj/JPlatform.hpp b/jrj/ext-jrj/JPlatform.hpp
new file mode 100644
index 0000000..a12e170
--- /dev/null
+++ b/jrj/ext-jrj/JPlatform.hpp
@@ -0,0 +1,5 @@
+#pragma once
+class JPlatform
+{
+};
+
diff --git a/jrj/ext-jrj/JScript.cpp b/jrj/ext-jrj/JScript.cpp
new file mode 100644
index 0000000..8b88c14
--- /dev/null
+++ b/jrj/ext-jrj/JScript.cpp
@@ -0,0 +1 @@
+#include "JScript.hpp"
diff --git a/jrj/ext-jrj/JScript.hpp b/jrj/ext-jrj/JScript.hpp
new file mode 100644
index 0000000..8084f47
--- /dev/null
+++ b/jrj/ext-jrj/JScript.hpp
@@ -0,0 +1,5 @@
+#pragma once
+class JScript
+{
+};
+
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index aad4d00..c8440a1 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -266,10 +266,14 @@
<ClInclude Include="..\xframe\xcontrol\xshtml.hpp" />
<ClInclude Include="..\xframe\xcontrol\xtreeview.hpp" />
<ClInclude Include="framework.h" />
+ <ClInclude Include="JAlloc.hpp" />
<ClInclude Include="JFactory.hpp" />
<ClInclude Include="JFactoryStringImpl.h" />
<ClInclude Include="JItemAlloc.hpp" />
+ <ClInclude Include="JLang.hpp" />
+ <ClInclude Include="JPlatform.hpp" />
<ClInclude Include="JPtr.hpp" />
+ <ClInclude Include="JScript.hpp" />
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
@@ -1131,9 +1135,13 @@
<ClCompile Include="..\xframe\src\nstring.cpp" />
<ClCompile Include="..\xframe\src\xstring.cpp" />
<ClCompile Include="dllmain.cpp" />
+ <ClCompile Include="JAlloc.cpp" />
<ClCompile Include="JFactoryStringImpl.cpp" />
<ClCompile Include="JItemAlloc.cpp" />
+ <ClCompile Include="JLang.cpp" />
+ <ClCompile Include="JPlatform.cpp" />
<ClCompile Include="JPtr.cpp" />
+ <ClCompile Include="JScript.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 59b6962..3ac429a 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -444,6 +444,18 @@
<ClInclude Include="JPtr.hpp">
<Filter>澶存枃浠�</Filter>
</ClInclude>
+ <ClInclude Include="JAlloc.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JPlatform.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JLang.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
+ <ClInclude Include="JScript.hpp">
+ <Filter>澶存枃浠�</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -1349,27 +1361,6 @@
<ClCompile Include="..\jarch.impl\JStringImpl.cpp">
<Filter>婧愭枃浠�</Filter>
</ClCompile>
- <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
<ClCompile Include="JFactoryStringImpl.cpp">
<Filter>婧愭枃浠�</Filter>
</ClCompile>
@@ -1382,6 +1373,39 @@
<ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
<Filter>project\business\PO</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="JAlloc.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JPlatform.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JLang.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="JScript.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ext-jrj.def">
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index 2127cef..7c9532b 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -41,7 +41,7 @@
return L"";
}
- string GetEntityIDName(/*param*/LPARAM pr)
+ xstring GetEntityIDName(/*param*/LPARAM pr)
{
if (m_configDoc)
{
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index dd30cea..ea5b653 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -55,12 +55,12 @@
return L"";
}
- virtual string GetEntityRowData(LPARAM pr)
+ virtual xstring GetEntityRowData(LPARAM pr)
{
return GetEntityData(pr);
}
- virtual string GetEntityData(int /*param*/ pr)
+ virtual xstring GetEntityData(LPARAM pr)
{
//trace(L"zzz");
return L"";
--
Gitblit v1.9.3