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

remove platform preprocess check in platform_spec.cpp

Browse Source
This commit is contained in:
Jinhao 2015-12-04 23:13:22 +08:00
parent 0d0e58172d
commit a5df90f8a9
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/detail/linux_X11/platform_spec.cpp
View File

@ -14,8 +14,6 @@
* http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt * http://standards.freedesktop.org/clipboards-spec/clipboards-0.1.txt
*/ */
#if defined(NANA_LINUX) || defined(NANA_MACOS)
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <locale> #include <locale>
@ -1414,7 +1412,3 @@ namespace detail
} }
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
//#if defined(NANA_LINUX) || defined(NANA_MACOS)
#endif

5
source/detail/win32/platform_spec.cpp
View File

@ -12,8 +12,6 @@
* This file provides basis class and data structrue that required by nana * This file provides basis class and data structrue that required by nana
*/ */
#if defined(NANA_WINDOWS)
#include <nana/detail/platform_spec_selector.hpp> #include <nana/detail/platform_spec_selector.hpp>
#include <shellapi.h> #include <shellapi.h>
#include <stdexcept> #include <stdexcept>
@ -292,6 +290,3 @@ namespace detail
} }
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana
//#if defined(NANA_WINDOWS)
#endif

12
source/internationalization.cpp
View File

@ -14,8 +14,6 @@
#include <nana/gui/widgets/widget.hpp> #include <nana/gui/widgets/widget.hpp>
#include <unordered_map> #include <unordered_map>
#include <fstream> #include <fstream>
#include <sstream> // Warning:(17, 1) [unused] Unused import statement
#include <memory> // Warning:(17, 1) [unused] Unused import statement
#if defined(STD_THREAD_NOT_SUPPORTED) #if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp> #include <nana/std_mutex.hpp>
@ -75,7 +73,7 @@ namespace nana
bool escape = false; bool escape = false;
for (auto i = read_ptr_ + 1; i != end_ptr_; ++i) for (auto i = read_ptr_ + 1; i != end_ptr_; ++i)
{ {
if (escape) // Warning:(78, 12) Condition is always false if (escape)
{ {
escape = false; escape = false;
continue; continue;
@ -88,6 +86,8 @@ namespace nana
reach_right_quota = true; reach_right_quota = true;
break; break;
} }
else if ('\\' == *i)
escape = true;
} }
_m_eat_ws(); _m_eat_ws();
if (read_ptr_ == end_ptr_ || '"' != *read_ptr_) if (read_ptr_ == end_ptr_ || '"' != *read_ptr_)
@ -268,10 +268,10 @@ namespace nana
{ {
auto result = mgr.table.emplace(wd, std::move(eval)); auto result = mgr.table.emplace(wd, std::move(eval));
result.first->second.destroy = nana::API::events(wd).destroy([wd]{ result.first->second.destroy = nana::API::events(wd).destroy([wd]{
auto & mgr = get_eval_manager(); // Warning:(271, 13) Local 'mgr' hides previous declaration auto & eval_mgr = get_eval_manager();
std::lock_guard<std::recursive_mutex> lock(mgr.mutex); // Local 'lock' hides previous std::lock_guard<std::recursive_mutex> lockgd(eval_mgr.mutex);
mgr.table.erase(wd); eval_mgr.table.erase(wd);
}); });
} }
else else