mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix a compiler error for VC++

Browse Source
This commit is contained in:
Jinhao 2018-05-11 17:15:32 +08:00
parent 734479562e
commit 57f69fde9f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/c++defines.hpp
View File

@ -77,7 +77,7 @@
// Select platform ...... // Select platform ......
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) //Microsoft Windows #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) //Microsoft Windows
#define NANA_WINDOWS #define NANA_WINDOWS
typedef DWORD_PTR thread_t; typedef unsigned long thread_t;
// MINGW ... // MINGW ...
#if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW) #if defined(__MINGW32__) || defined(__MINGW64__) || defined(MINGW)

4
source/system/platform.cpp
View File

@ -144,14 +144,14 @@ namespace system
return; return;
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
if(::ShellExecute(0, L"open", url.c_str(), 0, 0, SW_SHOWNORMAL) < reinterpret_cast<HINSTANCE>(32)) if(::ShellExecute(0, L"open", nana::to_wstring(url_utf8).c_str(), 0, 0, SW_SHOWNORMAL) < reinterpret_cast<HINSTANCE>(32))
{ {
//Because ShellExecute can delegate execution to Shell extensions (data sources, context menu handlers, //Because ShellExecute can delegate execution to Shell extensions (data sources, context menu handlers,
//verb implementations) that are activated using Component Object Model (COM), COM should be initialized //verb implementations) that are activated using Component Object Model (COM), COM should be initialized
//before ShellExecute is called. Some Shell extensions require the COM single-threaded apartment (STA) type. //before ShellExecute is called. Some Shell extensions require the COM single-threaded apartment (STA) type.
//In that case, COM should be initialized under WinXP. //In that case, COM should be initialized under WinXP.
nana::detail::platform_spec::co_initializer co_init; nana::detail::platform_spec::co_initializer co_init;
::ShellExecute(0, L"open", url.c_str(), 0, 0, SW_SHOWNORMAL); ::ShellExecute(0, L"open", nana::to_wstring(url_utf8).c_str(), 0, 0, SW_SHOWNORMAL);
} }
#elif defined(NANA_POSIX) #elif defined(NANA_POSIX)
posix_open_url(url_utf8.c_str()); posix_open_url(url_utf8.c_str());