merge beru's changes

This commit is contained in:
Jinhao
2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions

View File

@@ -354,24 +354,14 @@ namespace API
return r;
}
void window_icon_default(const paint::image& img)
void window_icon_default(const paint::image& small_icon, const paint::image& big_icon)
{
restrict::window_manager.default_icon(img);
restrict::window_manager.default_icon(small_icon, big_icon);
}
void window_icon_default(const paint::image& big_icon, const paint::image& small_icon)
void window_icon(window wd, const paint::image& small_icon, const paint::image& big_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);
restrict::window_manager.icon(reinterpret_cast<restrict::core_window_t*>(wd), small_icon, big_icon);
}
bool empty_window(window wd)