remove deprecated code and debug code

This commit is contained in:
Jinhao
2019-02-15 06:27:17 +08:00
parent 9f1d015355
commit bbc39906c0
16 changed files with 28 additions and 614 deletions

View File

@@ -144,8 +144,6 @@ namespace nana
const std::string&, nana::any*, bool reverse)> weak_ordering;
std::shared_ptr<paint::font> font; ///< The exclusive column font
column() = default;
column(const column&) = default;
@@ -6186,10 +6184,9 @@ namespace nana
const nana::any *rowval,
bool reverse)> comp)
{
if (first_col<0 || last_col<=first_col)
return;
if (last_col >= column_size())
if (last_col <= first_col || last_col >= column_size())
return;
std::vector<size_type> new_idx;
for(size_type i=first_col; i<=last_col; ++i) new_idx.push_back(i);
@@ -6207,7 +6204,7 @@ namespace nana
//Only change the view position of columns
for(size_t i=0; i<new_idx.size(); ++i)
{
move_column(new_idx[i],i+first_col);
_m_ess().header.move_to_view_pos(new_idx[i], i + first_col, true);
}
_m_ess().update();
}

View File

@@ -3382,7 +3382,6 @@ namespace nana {
::nana::paint::graphics canvas;
canvas.make({ px_w, px_h });
canvas.typeface(graph_.typeface());
::nana::point canvas_text_pos;
auto ent_pos = pos;
const auto str_end = str + len;

View File

@@ -1370,17 +1370,9 @@ namespace nana
{
auto m = std::max((enable_crook_ ? scheme_.crook_size : 0), (enable_icon_ ? scheme_.icon_size : 0));
#if 1
unsigned as = 0, ds = 0, il;
graph.text_metrics(as, ds, il);
return std::max(as + ds + 8, m);
#else
#ifdef _nana_std_has_string_view
return std::max(m, graph.text_extent_size(std::wstring_view{ L"jH{", 3 }).height + 8);
#else
return std::max(m, graph.text_extent_size(L"jH{", 3).height + 8);
#endif
#endif
}
virtual unsigned item_width(graph_reference graph, const item_attribute_t& attr) const override
@@ -1586,8 +1578,6 @@ namespace nana
int trigger::item_locator::operator()(node_type &node, int affect)
{
auto & node_desc = impl_->shape;
switch(affect)
{
case 0: break;
@@ -1692,7 +1682,6 @@ namespace nana
{
impl_->data.trigger_ptr = this;
impl_->data.renderer = nana::pat::cloneable<renderer_interface>(internal_renderer());
//impl_->data.comp_placer = nana::pat::cloneable<compset_placer_interface>(internal_placer()); //deprecated
impl_->adjust.timer.elapse([this]
{
@@ -1827,18 +1816,6 @@ namespace nana
}
}
/* //deprecated
void trigger::renderer(::nana::pat::cloneable<renderer_interface>&& r)
{
impl_->data.renderer = std::move(r);
}
const ::nana::pat::cloneable<renderer_interface>& trigger::renderer() const
{
return impl_->data.renderer;
}
*/
::nana::pat::cloneable<renderer_interface>& trigger::renderer() const
{
return impl_->data.renderer;
@@ -1876,21 +1853,6 @@ namespace nana
return x;
}
/*
trigger::node_type* trigger::selected() const //deprecated
{
return impl_->node_state.selected;
}
*/
/*
void trigger::selected(node_type* node) //deprecated
{
if(impl_->attr.tree_cont.verify(node) && impl_->set_selected(node))
impl_->draw(true);
}
*/
node_image_tag& trigger::icon(const std::string& id)
{
auto i = impl_->shape.image_table.find(id);
@@ -1958,7 +1920,6 @@ namespace nana
widget.bgcolor(colors::white);
impl_->data.widget_ptr = static_cast<::nana::treebox*>(&widget);
impl_->data.scheme_ptr = static_cast<::nana::treebox::scheme_type*>(API::dev::get_scheme(widget));
//impl_->data.comp_placer->init_scheme(impl_->data.scheme_ptr); //deprecated
impl_->data.comp_placer = nana::pat::cloneable<compset_placer_interface>(internal_placer{ *impl_->data.scheme_ptr });
widget.caption("nana treebox");
@@ -2386,7 +2347,6 @@ namespace nana
treebox::item_proxy treebox::selected() const
{
//return item_proxy(const_cast<drawer_trigger_t*>(&get_drawer_trigger()), get_drawer_trigger().selected()); //deprecated
auto dw = &get_drawer_trigger();
return item_proxy(const_cast<drawer_trigger_t*>(dw), dw->impl()->node_state.selected);
}