From 3eb54555f4c8a3df4acc203c28a2138bcbd0ed6f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 十二月 2024 18:05:29 +0800
Subject: [PATCH] update
---
jrj/xframe/devloper/XDevEditXWKDlg.cpp | 3 ++-
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/xframe/devloper/XDevEditXWorkNode.cpp | 2 ++
jrj/xframe/devloper/XDevEditFlow.cpp | 2 ++
jrj/ext-jrj/ext-jrj.vcxproj | 8 ++++----
jrj/project/business/ProductSample/new.Sample3.cpp | 0
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 63ecfa6..49ace90 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -1232,12 +1232,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\xframe\devloper\XDevEditXWKDlg.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\xframe\devloper\XDevEditXWorkNode.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\xframe\devloper\XDevItemDlg.cpp" />
<ClCompile Include="..\xframe\src\nmemory.cpp" />
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index 18b8175..e27fdaa 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/new.Sample3.cpp b/jrj/project/business/ProductSample/new.Sample3.cpp
index d72fc1a..8b314eb 100644
--- a/jrj/project/business/ProductSample/new.Sample3.cpp
+++ b/jrj/project/business/ProductSample/new.Sample3.cpp
Binary files differ
diff --git a/jrj/xframe/devloper/XDevEditFlow.cpp b/jrj/xframe/devloper/XDevEditFlow.cpp
index 9b664c3..18c3348 100644
--- a/jrj/xframe/devloper/XDevEditFlow.cpp
+++ b/jrj/xframe/devloper/XDevEditFlow.cpp
@@ -420,6 +420,8 @@
AttachEvent(L"flowlist",L"CBN_SELCHANGE", (FEvent)&XDevEditFlow::OnFlowSelected);
AttachEvent(L"dw_do",L"DWV_ROWFOCUSCHANGED", (FEvent)&XDevEditFlow::OnRowClickedDo);
+
+ return 1;
}
int OnInitial()
diff --git a/jrj/xframe/devloper/XDevEditXWKDlg.cpp b/jrj/xframe/devloper/XDevEditXWKDlg.cpp
index 082d656..29a482a 100644
--- a/jrj/xframe/devloper/XDevEditXWKDlg.cpp
+++ b/jrj/xframe/devloper/XDevEditXWKDlg.cpp
@@ -33,7 +33,7 @@
if (comdid == L"xmDevOk")
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0)
+ if (!hItem)
{
MessageBox(0,L"请选择功能模块!",L"",0);
return 1;
@@ -74,6 +74,7 @@
{
//绑定工具条点击事件
AttachEvent(L"WM_XCOMMAND", (FEvent)&dw_xwkdlg::OnXCommand);
+ return 1;
}
int OnInitial()
diff --git a/jrj/xframe/devloper/XDevEditXWorkNode.cpp b/jrj/xframe/devloper/XDevEditXWorkNode.cpp
index c2fff91..ad20dbb 100644
--- a/jrj/xframe/devloper/XDevEditXWorkNode.cpp
+++ b/jrj/xframe/devloper/XDevEditXWorkNode.cpp
@@ -139,6 +139,8 @@
AttachEvent(L"WM_XCOMMAND", (FEvent)&XDevEditWorkNode::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&XDevEditWorkNode::OnSetFocus);
+
+ return 1;
}
int OnInitial()
--
Gitblit v1.9.3