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

Merge branch 'macos' of https://github.com/BenjaminNavarro/nana into BenjaminNavarro-macos

Browse Source
This commit is contained in:
Jinhao
2015-11-10 23:21:07 +08:00
parent 9d49877a74 a09d5c3c95
commit 94c10c8fba
28 changed files with 2235 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/timer.cpp
View File

@@ -12,6 +12,7 @@
* A timer can repeatedly call a piece of code. The duration between
* calls is specified in milliseconds. Timer is defferent from other graphics
* controls, it has no graphics interface.
* @contributors: Benjamin Navarro(pr#81)
*/
#include <nana/deploy.hpp>
#include <nana/gui/timer.hpp>
@@ -26,7 +27,7 @@
#if defined(NANA_WINDOWS)
#include <windows.h>
#elif defined(NANA_LINUX)
#elif defined(NANA_LINUX) || defined(NANA_MACOS)
#include <nana/detail/platform_spec_selector.hpp>
#include <nana/system/platform.hpp>
#endif