Merge branch 'develop' of https://github.com/beru/nana into beru-develop
Conflicts: source/gui/widgets/skeletons/text_editor.cpp source/gui/widgets/textbox.cpp source/paint/detail/image_bmp.hpp source/paint/detail/image_ico.hpp
This commit is contained in:
@@ -359,11 +359,21 @@ namespace API
|
||||
restrict::window_manager.default_icon(img);
|
||||
}
|
||||
|
||||
void window_icon_default(const paint::image& big_icon, const paint::image& small_icon)
|
||||
{
|
||||
restrict::window_manager.default_icon(big_icon, small_icon);
|
||||
}
|
||||
|
||||
void window_icon(window wd, const paint::image& img)
|
||||
{
|
||||
restrict::window_manager.icon(reinterpret_cast<restrict::core_window_t*>(wd), img);
|
||||
}
|
||||
|
||||
void window_icon(window wd, const paint::image& big_icon, const paint::image& small_icon)
|
||||
{
|
||||
restrict::window_manager.icon(reinterpret_cast<restrict::core_window_t*>(wd), big_icon, small_icon);
|
||||
}
|
||||
|
||||
bool empty_window(window wd)
|
||||
{
|
||||
return (restrict::window_manager.available(reinterpret_cast<restrict::core_window_t*>(wd)) == false);
|
||||
|
||||
Reference in New Issue
Block a user