Merge branch 'hotfix-1.6.2' into develop-1.7
This commit is contained in:
@@ -104,6 +104,7 @@ namespace drawerbase
|
||||
struct element_tag
|
||||
{
|
||||
checkbox * uiobj;
|
||||
event_handle eh_clicked;
|
||||
event_handle eh_checked;
|
||||
event_handle eh_destroy;
|
||||
event_handle eh_keyboard;
|
||||
|
||||
@@ -92,6 +92,9 @@ namespace nana{
|
||||
/// Determines whether a specified option is checked, it throws an out_of_range if !(pos < number of options)
|
||||
bool option_checked(std::size_t pos) const;
|
||||
|
||||
/// Change typeface of caption label ( does not effect child widgets )
|
||||
void typeface( const nana::paint::font& font );
|
||||
|
||||
group& enable_format_caption(bool format);
|
||||
|
||||
group& collocate() noexcept;
|
||||
@@ -101,7 +104,7 @@ namespace nana{
|
||||
void field_display(const char* field_name, bool display); ///<Displays/Discards an existing field.
|
||||
bool field_display(const char* field_name) const; ///<Determines whether the specified field is displayed.
|
||||
void erase(window handle); ///< Erases a window from field.
|
||||
|
||||
|
||||
template<typename Widget, typename ...Args>
|
||||
Widget* create_child(const char* field, Args && ... args)
|
||||
{
|
||||
|
||||
@@ -151,7 +151,13 @@ namespace nana
|
||||
bool vertical() const;
|
||||
void maximum(unsigned);
|
||||
unsigned maximum() const;
|
||||
void value(unsigned);
|
||||
|
||||
/** Set slider value
|
||||
@param[in] v new value for slider.
|
||||
v will be clipped to the range 0 to maximum
|
||||
*/
|
||||
void value(int );
|
||||
|
||||
unsigned value() const;
|
||||
unsigned move_step(bool forward); ///< Increase or decrease the value of slider.
|
||||
unsigned adorn() const;
|
||||
|
||||
Reference in New Issue
Block a user