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

remove deprecated code

Browse Source
This commit is contained in:
Jinhao 2016-06-10 16:04:22 +08:00
parent 9c7ffbeb15
commit 5fdaeb6f45
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/nana/gui/widgets/listbox.hpp
View File

@ -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. /// Returns an index of item which contains the specified point.
index_pair cast(const point & pos) const; 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. /// Returns the column which contains the specified point.
columns_indexs column_from_pos(const point & pos); 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(); ///<Erases all categories. void erase(); ///<Erases all categories.
item_proxy erase(item_proxy); item_proxy erase(item_proxy);
/*
template<typename Key>
void erase_key(const Key& kv) //deprecated
{
typedef typename nana::detail::type_escape<Key>::type key_t;
nana::key<key_t, std::less<key_t> > key(kv);
_m_erase_key(&key);
}
template<typename Key>
void erase_key(Key&& kv)
{
typedef typename nana::detail::type_escape<Key>::type key_t;
nana::key<key_t, std::less<key_t> > key(std::move(kv));
_m_erase_key(&key);
}
*/
bool sortable() const; bool sortable() const;
void sortable(bool enable); void sortable(bool enable);

7
include/nana/gui/widgets/textbox.hpp
View File

@ -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. /// 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); 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; bool line_wrapped() const;
textbox& line_wrapped(bool); textbox& line_wrapped(bool);
/// Determine whether the text is multi-line enabled. /// Determines whether the text is multi-line enabled.
bool multi_lines() const; bool multi_lines() const;
textbox& multi_lines(bool); textbox& multi_lines(bool);
/// Determines whether the textbox accepts user input
bool editable() const; bool editable() const;
textbox& editable(bool); textbox& editable(bool);
void set_accept(std::function<bool(wchar_t)>); void set_accept(std::function<bool(wchar_t)>);
textbox& tip_string(::std::string); textbox& tip_string(::std::string);

14
source/gui/widgets/listbox.cpp
View File

@ -4571,20 +4571,6 @@ namespace nana
return at(pos_abs.cat).at(pos_abs.item); 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) // Contributed by leobackes(pr#97)
listbox::index_pair listbox::cast( const point& pos ) const listbox::index_pair listbox::cast( const point& pos ) const
{ {