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

Merge branch 'hotfix-1.2' into prepare-utf8

Browse Source
This commit is contained in:
Jinhao
2015-12-04 23:44:11 +08:00
parent e8266b5ae8 21a5e2fc2e
commit babcacd63d
28 changed files with 351 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
#include <nana/gui/detail/native_window_interface.hpp>
#include <nana/gui/screen.hpp>
#if defined(NANA_WINDOWS)
#if defined(NANA_MINGW) && defined(STD_THREAD_NOT_SUPPORTED)
#if defined(STD_THREAD_NOT_SUPPORTED)
#include <nana/std_mutex.hpp>
#else
#include <mutex>

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

@@ -463,10 +463,10 @@ namespace detail
}
}
void window_manager::default_icon(const nana::paint::image& small_icon, const nana::paint::image& big_icon)
void window_manager::default_icon(const nana::paint::image& _small, const nana::paint::image& big)
{
impl_->default_icon_big = big_icon;
impl_->default_icon_small = small_icon;
impl_->default_icon_big = big;
impl_->default_icon_small = _small;
}
void window_manager::icon(core_window_t* wd, const paint::image& small_icon, const paint::image& big_icon)