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

Merge branch 'develop' of https://github.com/loaden/nana into loaden-develop

Browse Source
This commit is contained in:
Jinhao 2018-04-21 03:58:24 +08:00
commit a25e116e32
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ bii/deps/*
build/vc2013-bkl/* build/vc2013-bkl/*
build/makefile-bkl/* build/makefile-bkl/*
build/compile_commands.json build/compile_commands.json
build/install_manifest.txt
*.obj *.obj
*.exe *.exe
*.pdb *.pdb

10
source/system/dataexch.cpp
View File

@ -208,20 +208,20 @@ namespace nana{ namespace system{
memcpy(addr, buf, size); memcpy(addr, buf, size);
::GlobalUnlock(g); ::GlobalUnlock(g);
unsigned data_format; unsigned data_format = CF_MAX;
switch(fmt) switch(fmt)
{ {
case format::text: data_format = CF_UNICODETEXT; break; case format::text: data_format = CF_UNICODETEXT; break;
case format::pixmap: data_format = CF_BITMAP; break; case format::pixmap: data_format = CF_BITMAP; break;
} }
res = (nullptr != ::SetClipboardData(data_format, g)); res = (nullptr != ::SetClipboardData(data_format, g));
} }
::CloseClipboard(); ::CloseClipboard();
} }
#elif defined(NANA_X11) #elif defined(NANA_X11)
auto & spec = ::nana::detail::platform_spec::instance(); auto & spec = ::nana::detail::platform_spec::instance();
Atom atom_type; Atom atom_type;
switch(fmt) switch(fmt)
{ {
@ -232,7 +232,7 @@ namespace nana{ namespace system{
spec.write_selection(owner, atom_type, buf, size); spec.write_selection(owner, atom_type, buf, size);
return true; return true;
#endif #endif
return res; return res;
} }
@ -244,7 +244,7 @@ namespace nana{ namespace system{
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
if(::OpenClipboard(::GetFocus())) if(::OpenClipboard(::GetFocus()))
{ {
unsigned data_format; unsigned data_format = CF_MAX;
switch(fmt) switch(fmt)
{ {
case format::text: data_format = CF_UNICODETEXT; break; case format::text: data_format = CF_UNICODETEXT; break;