Merge branch 'loaden-develop' into develop

This commit is contained in:
Jinhao 2018-04-21 03:58:38 +08:00
commit 9692283dfc
2 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

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

View File

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