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

fix clang compiling errors

Browse Source
This commit is contained in:
cnjinhao
2015-02-06 07:23:17 +08:00
parent 81a50fd84f
commit e0a9a94a8b
5 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/gui/widgets/widget.hpp
View File

@@ -266,7 +266,7 @@ namespace nana
return (this->empty() == false);
}
window handle() const
window handle() const override
{
return handle_;
}
@@ -349,7 +349,7 @@ namespace nana
API::activate_window(handle_);
}
window handle() const
window handle() const override
{
return handle_;
}
@@ -508,7 +508,7 @@ namespace nana
return (this->empty() == false);
}
window handle() const
window handle() const override
{
return handle_;
}

7
include/nana/paint/gadget.hpp
View File

@@ -1,6 +1,7 @@
/*
* Graphics Gadget Implementation
* Copyright(C) 2003-2013 Jinhao(cnjinhao@hotmail.com)
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
@@ -21,8 +22,8 @@ namespace paint
{
namespace gadget
{
void close_16_pixels(nana::paint::graphics&, int x, int y, uint32_t style, const color&);
void cross(nana::paint::graphics&, int x, int y, uint32_t size, uint32_t thickness, const nana::color&);
void close_16_pixels(::nana::paint::graphics&, int x, int y, unsigned style, const color&);
void cross(::nana::paint::graphics&, int x, int y, unsigned size, unsigned thickness, const nana::color&);
}//end namespace gadget