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

fix some issues that are detected by PVS-studio team

Browse Source
This commit is contained in:
Jinhao 2016-07-14 00:41:34 +08:00
parent 31455aa165
commit 0a0fab679b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/nana/gui/widgets/skeletons/text_token_stream.hpp
View File

@ -665,8 +665,7 @@ namespace nana{ namespace widgets{ namespace skeletons
case token::eof:
return;
default:
int * debug = 0; //for debug.
*debug = 0;
throw std::runtime_error("invalid token");
}
}
}

2
source/gui/detail/window_manager.cpp
View File

@ -293,7 +293,7 @@ namespace detail
auto result = native_interface::create_window(native, nested, r, app);
if (result.native_handle)
{
core_window_t* wd = new core_window_t(owner, widget_notifier_interface::get_notifier(wdg), (category::root_tag**)nullptr);
auto wd = new core_window_t(owner, widget_notifier_interface::get_notifier(wdg), (category::root_tag**)nullptr);
if (nested)
{
wd->owner = nullptr;

4
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -1312,7 +1312,7 @@ namespace nana{ namespace widgets
void text_editor::set_highlight(const std::string& name, const ::nana::color& fgcolor, const ::nana::color& bgcolor)
{
if (fgcolor.invisible() && fgcolor.invisible())
if (fgcolor.invisible() && bgcolor.invisible())
{
keywords_->schemes.erase(name);
return;
@ -3259,7 +3259,7 @@ namespace nana{ namespace widgets
else if (pos <= a.x && a.x < str_end)
{ //Partial selected
int endpos = static_cast<int>(b.x < str_end ? b.x : str_end);
std::unique_ptr<unsigned> pxbuf_ptr(new unsigned[len]);
std::unique_ptr<unsigned[]> pxbuf_ptr(new unsigned[len]);
unsigned * pxbuf = pxbuf_ptr.get();
if (graph_.glyph_pixels(ent.begin, len, pxbuf))
{