diff --git a/include/nana/gui/widgets/listbox.hpp b/include/nana/gui/widgets/listbox.hpp index 9973c67a..02f4fe88 100644 --- a/include/nana/gui/widgets/listbox.hpp +++ b/include/nana/gui/widgets/listbox.hpp @@ -736,9 +736,6 @@ By \a clicking on one header the list get \a reordered, first up, and then down /// Returns an index of item which contains the specified point. index_pair cast(const point & pos) const; - /// add categories in order when use a key? - //listbox& ordered_categories(bool); //deprecated - /// Returns the column which contains the specified point. columns_indexs column_from_pos(const point & pos); @@ -751,24 +748,6 @@ By \a clicking on one header the list get \a reordered, first up, and then down void erase(); /// - void erase_key(const Key& kv) //deprecated - { - typedef typename nana::detail::type_escape::type key_t; - nana::key > key(kv); - _m_erase_key(&key); - } - - template - void erase_key(Key&& kv) - { - typedef typename nana::detail::type_escape::type key_t; - nana::key > key(std::move(kv)); - _m_erase_key(&key); - } - */ - bool sortable() const; void sortable(bool enable); diff --git a/include/nana/gui/widgets/textbox.hpp b/include/nana/gui/widgets/textbox.hpp index 13b4eb9b..12008c37 100644 --- a/include/nana/gui/widgets/textbox.hpp +++ b/include/nana/gui/widgets/textbox.hpp @@ -172,15 +172,18 @@ namespace nana /// Appends an string. If `at_caret` is `true`, the string is inserted at the position of caret, otherwise, it is appended at end of the textbox. textbox& append(const std::string& text, bool at_caret); - /// Determine wheter the text is line wrapped. + /// Determines whether the text is line wrapped. bool line_wrapped() const; textbox& line_wrapped(bool); - /// Determine whether the text is multi-line enabled. + /// Determines whether the text is multi-line enabled. bool multi_lines() const; textbox& multi_lines(bool); + + /// Determines whether the textbox accepts user input bool editable() const; textbox& editable(bool); + void set_accept(std::function); textbox& tip_string(::std::string); diff --git a/source/gui/widgets/listbox.cpp b/source/gui/widgets/listbox.cpp index 8aca3d79..9c227d20 100644 --- a/source/gui/widgets/listbox.cpp +++ b/source/gui/widgets/listbox.cpp @@ -4571,20 +4571,6 @@ namespace nana return at(pos_abs.cat).at(pos_abs.item); } - /* - listbox& listbox::ordered_categories(bool enable_ordered) //deprecated - { - internal_scope_guard lock; - - auto & ess = _m_ess(); - if (ess.lister.enable_ordered(enable_ordered)) - ess.update(); - - return *this; - } - */ - - // Contributed by leobackes(pr#97) listbox::index_pair listbox::cast( const point& pos ) const {