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

Merge branch 'develop' of https://github.com/kmribti/nana into kmribti-develop

Browse Source
This commit is contained in:
Jinhao
2016-01-31 10:38:33 +08:00
parent 8eb131e093 f20c73129f
commit fd2a15b05a
2 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/nana/gui/widgets/toolbar.hpp
View File

@@ -83,8 +83,8 @@ namespace nana
using size_type = std::size_t; ///< A type to count the number of elements.
toolbar() = default;
toolbar(window, bool visible);
toolbar(window, const rectangle& = rectangle(), bool visible = true);
toolbar(window, bool visible, bool detached=false);
toolbar(window, const rectangle& = rectangle(), bool visible = true, bool detached = false);
void separate(); ///< Adds a separator.
void append(const ::std::string& text, const nana::paint::image& img); ///< Adds a control button.
@@ -92,6 +92,13 @@ namespace nana
bool enable(size_type index) const;
void enable(size_type index, bool enable_state);
void scale(unsigned s); ///< Sets the scale of control button.
void go_right();
bool detached() { return detached_; };
private:
bool detached_;
};
}//end namespace nana
#endif