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

Merge branch 'hotfix-1.1.3' into feature-docker-place

Browse Source
This commit is contained in:
Jinhao
2015-09-14 01:53:07 +08:00
parent 706ff76b98 fc307d5b99
commit de96ff2cab
8 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/detail/linux_X11/platform_spec.hpp
View File

@@ -106,6 +106,8 @@ namespace detail
~drawable_impl_type();
void fgcolor(const ::nana::color&); //deprecated
unsigned get_color() const;
unsigned get_text_color() const;
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);

1
include/nana/detail/win32/platform_spec.hpp
View File

@@ -146,6 +146,7 @@ namespace detail
void fgcolor(const ::nana::color&); //deprecated
unsigned get_color() const;
unsigned get_text_color() const;
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);

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

@@ -136,8 +136,11 @@ namespace nana
/// @param file_utf8 A UTF-8 string to a filename
void save_as_file(const char* file_utf8) const throw();
void set_color(const ::nana::color&);
void set_text_color(const ::nana::color&);
void set_color(const ::nana::color&); //deprecated, graphics::palette() instead
void set_text_color(const ::nana::color&); //deprecated, graphics::palette() instead
::nana::color palette(bool for_text) const;
graphics& palette(bool for_text, const ::nana::color&);
unsigned bidi_string(const nana::point&, const char_t *, std::size_t len);
unsigned bidi_string(const point& pos, const char*, std::size_t len);