From eb39d3d2ca26581f9f0254acd0b1f5d56c9869a8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 11:19:29 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/vindexmenu.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 6625177..6846501 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -29,7 +29,7 @@
int tabNo;
//int m_panelNo; // 褰撳墠鑿滃崟缁�
- string m_Assignment;
+ xstring m_Assignment;
public:
vindexmenu(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
@@ -56,7 +56,7 @@
int WA_ACTIVE = 1;
int WA_CLICKACTIVE = 2;
int SW_HIDE=0x1;
- WPARAM lw = evt->wParam & 0xffff;
+ WPARAM lw = evt->wParam;
int x = m_bCanDestroy;
if( lw ==WA_INACTIVE && x==1 )
{
--
Gitblit v1.9.3