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

fix interface issues of image_png and image_jpeg

Browse Source
This commit is contained in:
Jinhao 2016-01-24 01:23:42 +08:00
parent d06deb7e44
commit da6ad460c5
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/categorize.cpp
View File

@ -579,17 +579,17 @@ namespace nana
if ((style_.module.index != npos) && style_.module.have_selected) if ((style_.module.index != npos) && style_.module.have_selected)
{ {
node_handle node = nullptr;
if (ui_element::item_arrow == style_.list_trigger) if (ui_element::item_arrow == style_.list_trigger)
{ {
treebase_.tail(style_.active); treebase_.tail(style_.active);
node_handle node = treebase_.find_child(style_.module.items[style_.module.index]->text()); node = treebase_.find_child(style_.module.items[style_.module.index]->text());
if (!node) if (!node)
{ {
style_.listbox = nullptr; style_.listbox = nullptr;
return; return;
} }
treebase_.cur(node); treebase_.cur(node);
_m_selected(node);
} }
else if (ui_element::item_root != style_.list_trigger) else if (ui_element::item_root != style_.list_trigger)
{ {
@ -597,7 +597,9 @@ namespace nana
return; return;
} }
else else
_m_selected(treebase_.tail(style_.module.index)); node = treebase_.tail(style_.module.index);
_m_selected(node);
} }
API::refresh_window(window_); API::refresh_window(window_);

8
source/paint/detail/image_jpeg.hpp
View File

@ -26,13 +26,9 @@ namespace nana
std::jmp_buf setjmp_buf; std::jmp_buf setjmp_buf;
}; };
public: public:
bool open(const nana::char_t* jpeg_file) override bool open(const experimental::filesystem::path& jpeg_file) override
{ {
#ifdef NANA_UNICODE auto fp = ::fopen(to_osmbstr(to_utf8(jpeg_file.native())).c_str(), "rb");
FILE * fp = ::fopen(static_cast<std::string>(nana::charset(jpeg_file)).c_str(), "rb");
#else
FILE* fp = ::fopen(jpeg_file, "rb");
#endif
if(nullptr == fp) return false; if(nullptr == fp) return false;
bool is_opened = false; bool is_opened = false;

8
source/paint/detail/image_png.hpp
View File

@ -20,13 +20,9 @@ namespace nana
: public basic_image_pixbuf : public basic_image_pixbuf
{ {
public: public:
bool open(const nana::char_t* png_file) override bool open(const experimental::filesystem::path& png_file) override
{ {
#ifdef NANA_UNICODE auto fp = ::fopen(to_osmbstr(to_utf8(png_file.native())).c_str(), "rb");
FILE * fp = ::fopen(static_cast<std::string>(nana::charset(png_file)).c_str(), "rb");
#else
FILE* fp = ::fopen(png_file, "rb");
#endif
if(nullptr == fp) return false; if(nullptr == fp) return false;
bool is_opened = false; bool is_opened = false;