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

Merge branch 'loaden-develop' into develop

Browse Source
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
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

4
source/system/dataexch.cpp
View File

@ -208,7 +208,7 @@ 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;
@ -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;