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

fix false alarm of event memory leak

Browse Source 
remove the unnecessary event leak check
This commit is contained in:
Jinhao 2015-04-10 00:44:49 +08:00
parent c143ba6816
commit 0ebf3dfacb
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nana/gui/detail/events_operation.hpp
View File

@ -23,7 +23,6 @@ namespace nana
void register_evt(event_handle); void register_evt(event_handle);
void cancel(event_handle); void cancel(event_handle);
void erase(event_handle); void erase(event_handle);
std::size_t size() const;
private: private:
mutable std::recursive_mutex mutex_; mutable std::recursive_mutex mutex_;
std::unordered_set<event_handle> register_; std::unordered_set<event_handle> register_;

6
source/gui/detail/events_operation.cpp
View File

@ -41,12 +41,6 @@ namespace nana
reinterpret_cast<detail::docker_interface*>(evt)->get_event()->remove(evt); reinterpret_cast<detail::docker_interface*>(evt)->get_event()->remove(evt);
} }
} }
std::size_t events_operation::size() const
{
lock_guard lock(mutex_);
return register_.size();
}
//end namespace events_operation //end namespace events_operation
}//end namespace detail }//end namespace detail
}//end namespace nana }//end namespace nana

6
source/gui/detail/win32/bedrock.cpp
View File

@ -266,12 +266,6 @@ namespace detail
::MessageBoxA(0, ss.str().c_str(), ("Nana C++ Library"), MB_OK); ::MessageBoxA(0, ss.str().c_str(), ("Nana C++ Library"), MB_OK);
} }
if(evt_operation.size())
{
std::stringstream ss;
ss<<"Nana.GUI detects a memory leaks in events operation, "<<static_cast<unsigned>(evt_operation.size())<<" event(s) are not uninstalled.";
::MessageBoxA(0, ss.str().c_str(), ("Nana C++ Library"), MB_OK);
}
delete impl_; delete impl_;
delete pi_data_; delete pi_data_;
} }

2
source/gui/screen.cpp
View File

@ -30,7 +30,7 @@ namespace nana
#if defined(NANA_WINDOWS) #if defined(NANA_WINDOWS)
real_display(std::size_t number, const MONITORINFOEX& mi) real_display(std::size_t number, const MONITORINFOEX& mi)
: index_(number), : index_(number),
is_primary_(mi.dwFlags & MONITORINFOF_PRIMARY), is_primary_(mi.dwFlags & /*MONITORINFOF_PRIMARY*/ 0x1),
area_(mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right - mi.rcMonitor.left, mi.rcMonitor.bottom - mi.rcMonitor.top), area_(mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right - mi.rcMonitor.left, mi.rcMonitor.bottom - mi.rcMonitor.top),
workarea_(mi.rcWork.left, mi.rcWork.top, mi.rcWork.right - mi.rcWork.left, mi.rcWork.bottom - mi.rcWork.top) workarea_(mi.rcWork.left, mi.rcWork.top, mi.rcWork.right - mi.rcWork.left, mi.rcWork.bottom - mi.rcWork.top)
{ {