Fixed #110 can not compile under /permissive mode

netease-im · Aug 26, 2019 · 45c5104 · 45c5104
1 parent 0ccc90a
commit 45c5104
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tool_kits/duilib/Control/Button.h b/tool_kits/duilib/Control/Button.h
@@ -27,7 +27,7 @@ class UILIB_API ButtonTemplate : public LabelTemplate<InheritType>
 template<typename InheritType>
 UINT ui::ButtonTemplate<InheritType>::GetControlFlags() const
 {
-	return IsKeyboardEnabled() && IsEnabled() ? UIFLAG_TABSTOP : UIFLAG_DEFAULT;
+	return this->IsKeyboardEnabled() && this->IsEnabled() ? UIFLAG_TABSTOP : UIFLAG_DEFAULT;
 }
 
 template<typename InheritType>

diff --git a/tool_kits/duilib/Control/RichEdit.cpp b/tool_kits/duilib/Control/RichEdit.cpp
@@ -301,7 +301,9 @@ CTxtWinHost::~CTxtWinHost()
 
 BOOL CTxtWinHost::Init(RichEdit *re, const CREATESTRUCT *pcs)
 {
+	PCreateTextServices TextServicesProc = nullptr;
     IUnknown *pUnk = nullptr;
+	HMODULE hmod = NULL;
     HRESULT hr;
 	std::wstring edit_dll(L"msftedit.dll");
     m_re = re;
@@ -349,7 +351,6 @@ BOOL CTxtWinHost::Init(RichEdit *re, const CREATESTRUCT *pcs)
     //if(FAILED(CreateTextServices(NULL, this, &pUnk)))
     //    goto err;
 
-	PCreateTextServices TextServicesProc = nullptr;
 	//解决32位系统下跨窗口间拖拽文字在win7及win7以下系统上会出现重复的问题（64位暂不修复） lty 20170714
 #if defined(_M_X64) || defined(__x86_64__)
 	edit_dll = L"msftedit.dll";
@@ -358,7 +359,7 @@ BOOL CTxtWinHost::Init(RichEdit *re, const CREATESTRUCT *pcs)
 	if (!(::GetFileAttributesW(edit_dll.c_str()) != INVALID_FILE_ATTRIBUTES))
 		edit_dll = L"msftedit.dll";
 #endif
-	HMODULE hmod = LoadLibraryW(edit_dll.c_str()); //msftedit.dll
+	hmod = LoadLibraryW(edit_dll.c_str()); //msftedit.dll
 	if (hmod)
 	{
 		TextServicesProc = (PCreateTextServices)GetProcAddress(hmod,"CreateTextServices");