From b76cfabb985d364850a04c8a70f5c04293357da4 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 15 十一月 2024 10:06:29 +0800
Subject: [PATCH] 1. 添加控件库 2.Axis设定界面文本字体不跟对话框大小变化3.修复修改用户界面的bug
---
SourceCode/Bond/BLControlsSDK/include/StaticMap.h | 24 +++---
SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h | 19 ++++
SourceCode/Bond/BondEq/AxisSettingsDlg.cpp | 25 +++--
SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp | 5 +
SourceCode/Bond/BLControlsSDK/include/FontStatic.h | 16 +++
SourceCode/Bond/BLControlsSDK/include/SortClass.h | 18 ++++
SourceCode/Bond/BondEq/stdafx.h | 7 +
SourceCode/Bond/BLControlsSDK/include/LogCtrl.h | 105 +++++++++++++-------------
SourceCode/Bond/BondEq/View/LoginDlg.cpp | 1
SourceCode/Bond/BLControlsSDK/include/GradientStatic.h | 14 +++
10 files changed, 153 insertions(+), 81 deletions(-)
diff --git a/SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h b/SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h
index 5d40f9c..a328d00 100644
--- a/SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h
+++ b/SourceCode/Bond/BLControlsSDK/include/BLJogBtn2Parent.h
@@ -1,7 +1,24 @@
+#if !defined(AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_)
+#define AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// BLJogBtn2Parent.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
// by ChaeBL
typedef struct _BLJOGBTN2PARENT
{
virtual BOOL SendMessageToParent(LPCTSTR message) = 0;
virtual BOOL SendMessageToParent(int nMsg) = 0;
-} BLJogBtn2Parent, *pBLJogBtn2Parent;
\ No newline at end of file
+} BLJogBtn2Parent, *pBLJogBtn2Parent;
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_BLJOGBTN2PARENT_H__5A9433C1_E8A9_4393_9E0D_B7A996B9AF3F__INCLUDED_)
\ No newline at end of file
diff --git a/SourceCode/Bond/BLControlsSDK/include/FontStatic.h b/SourceCode/Bond/BLControlsSDK/include/FontStatic.h
index 35b2a33..1e40706 100644
--- a/SourceCode/Bond/BLControlsSDK/include/FontStatic.h
+++ b/SourceCode/Bond/BLControlsSDK/include/FontStatic.h
@@ -1,5 +1,13 @@
-#pragma once
+#if !defined(AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
+#define AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// FontStatic.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
// Defines for the font style
#define FS_NORMAL 0x00
#define FS_BOLD 0x01
@@ -66,4 +74,10 @@
afx_msg void OnPaint();
};
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_FONTSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
diff --git a/SourceCode/Bond/BLControlsSDK/include/GradientStatic.h b/SourceCode/Bond/BLControlsSDK/include/GradientStatic.h
index d7c72a7..b10e8dc 100644
--- a/SourceCode/Bond/BLControlsSDK/include/GradientStatic.h
+++ b/SourceCode/Bond/BLControlsSDK/include/GradientStatic.h
@@ -1,6 +1,13 @@
+#if !defined(AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
+#define AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_
+
+#if _MSC_VER > 1000
#pragma once
+#endif // _MSC_VER > 1000
+// FontStatic.h : header file
+//
-
+/////////////////////////////////////////////////////////////////////////////
// CGradientStatic
typedef UINT (CALLBACK* LPFNDLLFUNC1)(HDC,CONST PTRIVERTEX,DWORD,CONST PVOID,DWORD,DWORD);
@@ -146,4 +153,9 @@
public:
};
+/////////////////////////////////////////////////////////////////////////////
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_GRADIENSTATIC_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
diff --git a/SourceCode/Bond/BLControlsSDK/include/LogCtrl.h b/SourceCode/Bond/BLControlsSDK/include/LogCtrl.h
index 4b81fd1..bcff222 100644
--- a/SourceCode/Bond/BLControlsSDK/include/LogCtrl.h
+++ b/SourceCode/Bond/BLControlsSDK/include/LogCtrl.h
@@ -1,5 +1,4 @@
//LogCtrl.h
-//LogCtrl.h
#ifndef __LOGCTRL_H
#define __LOGCTRL_H
#define __LOGCTRL_LIB_H
@@ -46,18 +45,18 @@
typedef struct tagLOGCELL
{
- BYTE m_nLine; //惑窍谅快 扼牢
- UINT m_nState;//促弗伎苞 捍钦灯绰瘤 ..
- UINT m_nFormat;//沥纺葛靛
- RECT m_rect; //伎狼 康开
- COLORREF m_txtclr;//臂磊祸
- COLORREF m_bkgclr;//硅版祸
- CString m_strTxt;//臂磊
- CFont* m_pfont; //迄飘
- CBitmap* m_pBitmap;//厚飘甘
+ BYTE m_nLine; //鎯戠獚璋呭揩 鎵肩墷
+ UINT m_nState;//淇冨紬浼庤嫗 鎹嶉挦鐏话鐦� ..
+ UINT m_nFormat;//娌ョ汉钁涢潧
+ RECT m_rect; //浼庣嫾 搴峰紑
+ COLORREF m_txtclr;//鑷傜绁�
+ COLORREF m_bkgclr;//纭呯増绁�
+ CString m_strTxt;//鑷傜
+ CFont* m_pfont; //杩勯
+ CBitmap* m_pBitmap;//鍘氶鐢�
}LOGCELL;
-//Orientation=啊肺(1), 技肺(2) bDialog=DoModal()
+//Orientation=鍟婅偤(1), 鎶�鑲�(2) bDialog=DoModal()
class CPrintDC
{
public:
@@ -93,96 +92,96 @@
void RemoveAll();
void operator=(CLogPage& page);
- //青,凯 肮荐甫 汲沥茄促.
+ //闈�,鍑� 鑲崘鐢� 姹叉播鑼勪績.
void SetColCount(int nCount);
void SetRowCount(int nCount);
BOOL RemoveRow(int nRow);
- //厘钎 免仿困摹
+ //鍘橀拵 鍏嶄豢鍥版懝
void SetStartPoint(CPoint startPnt);
CPoint GetStartPoint() const;
- //青,凯 肮荐甫 府畔茄促.
+ //闈�,鍑� 鑲崘鐢� 搴滅晹鑼勪績.
int GetColCount() const;
int GetRowCount() const;
- //气,臭捞甫 汲沥茄促.
+ //姘�,鑷崬鐢� 姹叉播鑼勪績.
BOOL SetColWidth(int nCol, int nWidth);
BOOL SetRowHeight(int nRow, int nHeight);
- //迄飘甫 汲沥茄促.
+ //杩勯鐢� 姹叉播鑼勪績.
BOOL SetCellFont(int nRow, int nCol, CFont* pf);
BOOL SetCellFont(int nsRow, int nsCol, int neRow, int neCol, CFont* pf);
CFont* GetCellFont(int nRow, int nCol);
- //硅版祸阑 汲沥茄促.
+ //纭呯増绁搁槕 姹叉播鑼勪績.
BOOL SetCellBkgColor(int nRow, int nCol, COLORREF color);
COLORREF GetCellBkgColor(int nRow, int nCol);
- //臂磊祸阑 汲沥茄促.
+ //鑷傜绁搁槕 姹叉播鑼勪績.
BOOL SetCellTxtColor(int nRow, int nCol, COLORREF color);
COLORREF GetCellTxtColor(int nRow, int nCol);
- //臂磊困摹 汲沥
+ //鑷傜鍥版懝 姹叉播
BOOL SetCellFormat(int nRow, int nCol, int nFormat);
int GetCellFormat(int nRow, int nCol);
- //Rect阑 汲沥茄促.
+ //Rect闃� 姹叉播鑼勪績.
BOOL SetCellRect(int nRow, int nCol, CRect rect);
BOOL GetCellRect(int nRow, int nCol, CRect& rect);
- //BITMAP阑 汲沥茄促.
+ //BITMAP闃� 姹叉播鑼勪績.
BOOL SetCellBmp(int nRow, int nCol, CBitmap* pBmp);
CBitmap* GetCellBmp(int nRow, int nCol);
- //荤阿屈 弊副锭 绢蠢 困摹甫 弊副 巴牢啊 汲沥茄促.
+ //鑽ら樋灞� 寮婂壇閿� 缁㈣牏 鍥版懝鐢� 寮婂壇 宸寸墷鍟� 姹叉播鑼勪績.
BOOL SetCellLine(int nRow, int nCol, int nState=LCS_RECT/*LCS_RECT*/);
int GetCellLine(int nRow, int nCol);
- //伎俊 臂磊阑 涝仿茄促.
+ //浼庝繆 鑷傜闃� 娑濅豢鑼勪績.
BOOL SetItemText(int nRow, int nCol, LPCTSTR lpstr, int nFormat=DT_CENTER|DT_VCENTER|DT_SINGLELINE);
CString GetItemText(int nRow, int nCol);
BOOL SetCell(int nRow, int nCol, CLogCell lc);
CLogCell* GetCell(int nRow, int nCol);
- //伎阑 捍钦茄促.
+ //浼庨槕 鎹嶉挦鑼勪績.
BOOL CellMerge(int nsCol, int nsRow, int neCol ,int neRow );
- //免仿茄促.(nPageNO绰 其捞瘤 锅龋捞哥 0老 版快 免仿登瘤 臼绰促.)
+ //鍏嶄豢鑼勪績.(nPageNO缁� 鍏舵崬鐦� 閿呴緥鎹炲摜 0鑰� 鐗堝揩 鍏嶄豢鐧荤槫 鑷肩话淇�.)
void Draw(CDC* pDC, int nPageNO=0);
- //SetPageRect(,)窃荐甫 荤侩矫
- //Draw(CDC* pDC, int nPageNO=0);窃荐甫 龋免窍扁 官肺傈俊 荤侩秦具窃
- //侩档:
+ //SetPageRect(,)绐冭崘鐢� 鑽や京鐭�
+ //Draw(CDC* pDC, int nPageNO=0);绐冭崘鐢� 榫嬪厤绐嶆墎 瀹樿偤鍌堜繆 鑽や京绉﹀叿绐�
+ //渚╂。:
// <<page>> <<device>>
// 0 100 0 1000
- // ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ ΓΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΔ
- // Β (10,10) (90,10)Β Β (100,100) (900,100)Β
- // Β ΓΑΑΑΑΑΑΑΑΑΑΑΔ Β Β ΓΑΑΑΑΑΑΑΑΑΑΑΔ Β
- // Β Β Β Β Β Β Β Β
- // Β Β Β ΜΜΜΜΜΜΜ>Β Β Β
- // Β Β Β Β Β Β Β Β
- // Β Β Β Β Β Β Β Β
- // Β ΖΑΑΑΑΑΑΑΑΑΑΑΕ Β Β ΖΑΑΑΑΑΑΑΑΑΑΑΕ Β
- // Β (10,40) (90,40)Β Β (100,400) (900,400)Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // Β Β Β Β
- // ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ ΖΑΑΑΑΑΑΑΑΑΑΑΑΑΑΑΕ
+ // 螕螒螒螒螒螒螒螒螒螒螒螒螒螒螒螒螖 螕螒螒螒螒螒螒螒螒螒螒螒螒螒螒螒螖
+ // 螔 (10,10) (90,10)螔 螔 (100,100) (900,100)螔
+ // 螔 螕螒螒螒螒螒螒螒螒螒螒螒螖 螔 螔 螕螒螒螒螒螒螒螒螒螒螒螒螖 螔
+ // 螔 螔 螔 螔 螔 螔 螔 螔
+ // 螔 螔 螔 螠螠螠螠螠螠螠>螔 螔 螔
+ // 螔 螔 螔 螔 螔 螔 螔 螔
+ // 螔 螔 螔 螔 螔 螔 螔 螔
+ // 螔 螙螒螒螒螒螒螒螒螒螒螒螒螘 螔 螔 螙螒螒螒螒螒螒螒螒螒螒螒螘 螔
+ // 螔 (10,40) (90,40)螔 螔 (100,400) (900,400)螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螔 螔 螔 螔
+ // 螙螒螒螒螒螒螒螒螒螒螒螒螒螒螒螒螘 螙螒螒螒螒螒螒螒螒螒螒螒螒螒螒螒螘
// 200 100,200 2000 1000,2000
//
// CRect page(0,0,100,200);
// CRect device(0,0,1000,2000);
- // 咯归阑 炼陛 林妨搁: CRect device(100,100,900,1900);
+ // 鍜綊闃� 鐐奸櫅 鏋楀Θ鎼�: CRect device(100,100,900,1900);
// SetPageRect(pDC, page, device);
BOOL SetPageRect(CDC* pDC, CRect page, CRect device);
protected:
@@ -193,9 +192,9 @@
CLogItemArray m_liAry;
};
-//厘钎 傈眉甫 包府茄促.
-//厘钎甫 免仿窍扁 困秦 怖 鞘夸窍柳 臼促.
-//CLogPage甫 荤侩秦档 公规窍促.
+//鍘橀拵 鍌堢湁鐢� 鍖呭簻鑼勪績.
+//鍘橀拵鐢� 鍏嶄豢绐嶆墎 鍥扮Е 鎬� 闉樺じ绐嶆煶 鑷间績.
+//CLogPage鐢� 鑽や京绉︽。 鍏绐嶄績.
class CLogCtrl
{
public:
diff --git a/SourceCode/Bond/BLControlsSDK/include/SortClass.h b/SourceCode/Bond/BLControlsSDK/include/SortClass.h
index b6b2d83..cefe542 100644
--- a/SourceCode/Bond/BLControlsSDK/include/SortClass.h
+++ b/SourceCode/Bond/BLControlsSDK/include/SortClass.h
@@ -1,4 +1,13 @@
+#if !defined(AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
+#define AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+// SortClass.h : header file
+//
+
+/////////////////////////////////////////////////////////////////////////////
class CSortClass
{
@@ -37,4 +46,11 @@
int iInt ;
DWORD dw;
};
-};
\ No newline at end of file
+};
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_SORTCLASS_H__16C6D980_BD45_11D3_BDA3_00104B133581__INCLUDED_)
\ No newline at end of file
diff --git a/SourceCode/Bond/BLControlsSDK/include/StaticMap.h b/SourceCode/Bond/BLControlsSDK/include/StaticMap.h
index 591e458..66e69c3 100644
--- a/SourceCode/Bond/BLControlsSDK/include/StaticMap.h
+++ b/SourceCode/Bond/BLControlsSDK/include/StaticMap.h
@@ -13,7 +13,7 @@
#define ORIGIN_RIGHTBOTTOM 3
#define UM_MAP_CHANGED 5573
-#define _MENU_DEFECT_LIST_ID_ 8000
+#define _MENU_DEFECT_LIST_ID_ 8000
/////////////////////////////////////////////////////////////////////////////
// CStaticMap window
enum OriginDirection { OD_LeftTop = 0, OD_RightTop = 1, OD_LeftBottom = 10, OD_RightBottom = 11 };
@@ -29,7 +29,7 @@
// Operations
public:
- void InitGlass(CWnd* pParent, int nMapWidth, int nMapHeight, int nMapMargin); // Pixel 窜困 付柳.
+ void InitGlass(CWnd* pParent, int nMapWidth, int nMapHeight, int nMapMargin); // Pixel 绐滃洶 浠樻煶.
void DeinitGlass();
int GetMapTotalWidth() { return m_nMapTotalWidth; }
int GetMapTotalHeight() { return m_nMapTotalHeight; }
@@ -50,7 +50,7 @@
virtual void RegistNoDefect() { }
virtual void Timer(UINT nIDEvent) { }
- // 犬措/绵家
+ // 鐘帾/缁靛
void IncreaseRatio();
void DecreaseRatio();
void ResetRatio();
@@ -61,7 +61,7 @@
void SetDisplayRect(CPoint& PointStart, CPoint& PointEnd);
void SetShowShot(BOOL bShow) { m_bShowShot = bShow; }
- // 历厘
+ // 鍘嗗帢
void SaveMapToFile(CString strFileName);
void SetBGColor(COLORREF color) { m_clBGColor = color; }
@@ -95,7 +95,7 @@
long m_clBGColor;
long m_clPatColor;
//////////////////////////////////////////////////////////////////////////
- // 弊府扁 沥焊
+ // 寮婂簻鎵� 娌ョ剨
HBITMAP m_hDrawingSurface;
BITMAPINFOHEADER m_BMIH;
CRect m_RectDrawingSurface;
@@ -104,24 +104,24 @@
OriginDirection m_OriginDir;
int m_nUnitSize;
- // Cell 弊府扁
+ // Cell 寮婂簻鎵�
BOOL m_bShowShot;
- // 犬措/绵家
+ // 鐘帾/缁靛
CRect m_RectShowWnd;
double m_dRatio;
CPoint m_PointWindowStart;
BOOL m_bDragMove;
CPoint m_PointDragStart;
- BOOL m_bIsMiniMap; // Minimap篮 犬措/绵家甫 救茄促.
- CPoint m_PointGlassStart; // Glass 吝 泅犁 焊咯瘤绰 康开.
+ BOOL m_bIsMiniMap; // Minimap绡� 鐘帾/缁靛鐢� 鏁戣寗淇�.
+ CPoint m_PointGlassStart; // Glass 鍚� 娉呯妬 鐒婂挴鐦ょ话 搴峰紑.
CPoint m_PointGlassEnd;
- POINT m_PointCCut[3]; //内呈钠 弊府扁 谅钎
+ POINT m_PointCCut[3]; //鍐呭憟閽� 寮婂簻鎵� 璋呴拵
int m_nCCutSize;
- int m_nCoordGabX; // 谅钎甫 谎副 芭府.
- int m_nCoordGabY; // 谅钎甫 谎副 芭府.
+ int m_nCoordGabX; // 璋呴拵鐢� 璋庡壇 鑺簻.
+ int m_nCoordGabY; // 璋呴拵鐢� 璋庡壇 鑺簻.
//{{AFX_MSG(CStaticGlass)
afx_msg void OnPaint();
diff --git a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
index 9bd1482..e92cb8c 100644
--- a/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
+++ b/SourceCode/Bond/BondEq/AxisSettingsDlg.cpp
@@ -210,16 +210,6 @@
pWnd->MoveWindow(newX, newY, newWidth, newHeight);
AdjustControlFont(pWnd, newWidth, newHeight);
- if (pWnd->IsKindOf(RUNTIME_CLASS(CComboBox))) {
- CComboBox* pComboBox = (CComboBox*)pWnd;
- pComboBox->SetItemHeight(-1, newHeight); // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
- }
-
- if (pWnd->IsKindOf(RUNTIME_CLASS(CStatic))) {
- CStatic* pStatic = (CStatic*)pWnd;
- pStatic->ModifyStyle(0, SS_CENTER | SS_CENTERIMAGE);
- }
-
// 鑾峰彇涓嬩竴涓帶浠�
pWnd = pWnd->GetNextWindow();
}
@@ -227,8 +217,21 @@
void CAxisSettingsDlg::AdjustControlFont(CWnd* pWnd, int nWidth, int nHeight)
{
- int fontSize = nHeight - 10;
+ TCHAR szClassName[256];
+ GetClassName(pWnd->m_hWnd, szClassName, sizeof(szClassName));
+ if (_tcsicmp(szClassName, _T("Static")) == 0) {
+ CStatic* pStatic = (CStatic*)pWnd;
+ pStatic->ModifyStyle(0, SS_CENTER | SS_CENTERIMAGE);
+ return;
+ }
+
+ if (_tcsicmp(szClassName, _T("ComboBox")) == 0) {
+ CComboBox* pComboBox = (CComboBox*)pWnd;
+ pComboBox->SetItemHeight(-1, nHeight); // -1 琛ㄧず鎵�鏈夐」鐨勯珮搴�
+ }
+
+ int fontSize = nHeight - 10;
CFont* pCurrentFont = pWnd->GetFont();
LOGFONT logFont;
pCurrentFont->GetLogFont(&logFont);
diff --git a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
index e031a81..7fe322e 100644
--- a/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/ChangePasswordDlg.cpp
@@ -82,6 +82,11 @@
return;
}
+ if (newPassword.Compare(currentPassword) == 0) {
+ EndDialog(IDCANCEL);
+ return;
+ }
+
#ifdef UNICODE
std::string strUsername = CStringA(username);
std::string strCurrentPassword = CStringA(currentPassword);
diff --git a/SourceCode/Bond/BondEq/View/LoginDlg.cpp b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
index 6fc4d3b..9dae4f8 100644
--- a/SourceCode/Bond/BondEq/View/LoginDlg.cpp
+++ b/SourceCode/Bond/BondEq/View/LoginDlg.cpp
@@ -109,7 +109,6 @@
void CLoginDlg::OnBnClickedChangePassword()
{
CChangePasswordDlg changePasswordDlg;
- changePasswordDlg.DoModal();
if (changePasswordDlg.DoModal() == IDOK) {
m_editPassword.SetWindowText("");
}
diff --git a/SourceCode/Bond/BondEq/stdafx.h b/SourceCode/Bond/BondEq/stdafx.h
index 741d4c7..285fe37 100644
--- a/SourceCode/Bond/BondEq/stdafx.h
+++ b/SourceCode/Bond/BondEq/stdafx.h
@@ -47,17 +47,24 @@
#include "..\DatabaseSDK\include\MySQLDatabase.h"
#include "..\DatabaseSDK\include\SQLiteDatabase.h"
+// 控件模块
+#include "..\BLControlsSDK\include\BLControls.h"
+
#if defined(_WIN64)
#if defined(_DEBUG)
#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Debug\\DatabaseEx.lib")
+ #pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Debug\\BLControlsD.lib")
#else
#pragma comment(lib, "..\\DatabaseSDK\\lib\\x64\\Release\\DatabaseEx.lib")
+ #pragma comment(lib, "..\\BLControlsSDK\\lib\\x64\\Release\\BLControls.lib")
#endif
#else
#if defined(_DEBUG)
#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Debug\\DatabaseEx.lib")
+ #pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Debug\\BLControlsD.lib")
#else
#pragma comment(lib, "..\\DatabaseSDK\\lib\\Win32\\Release\\DatabaseEx.lib")
+ #pragma comment(lib, "..\\BLControlsSDK\\lib\\Win32\\Release\\BLControls.lib")
#endif
#endif
--
Gitblit v1.9.3