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 2015-07-20 22:57:22 +08:00
parent 628266adb4
commit d8a964d8f0
4 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/nana/gui/detail/basic_window.hpp
View File

@ -46,18 +46,13 @@ namespace detail
bool visible() const;
::nana::size size() const;
void size(const ::nana::size&);
void update();
//private:
//void _m_visible(bool isshow); //deprecated
private:
core_window_t* wd_;
::nana::point point_;
::nana::size size_;
::nana::size paint_size_;
visible_state visible_state_;
//bool visible_;
//bool real_visible_state_; //deprecated
bool out_of_range_;
::nana::rectangle effective_range_;
};//end class caret_descriptor

32
source/gui/detail/basic_window.cpp
View File

@ -22,8 +22,7 @@ namespace nana
if(active)
{
native_interface::caret_create(wd_->root, size_);
//real_visible_state_ = false;
//visible_ = false;
visible_state_ = visible_state::invisible;
this->position(point_.x, point_.y);
}
@ -79,15 +78,6 @@ namespace nana
void caret_descriptor::visible(bool is_show)
{
/*
if(visible_ != isshow) //deprecated
{
visible_ = isshow;
if(visible_ == false || false == out_of_range_)
_m_visible(isshow);
}
*/
auto pre_displayed = (visible_state::displayed == visible_state_);
if (is_show)
@ -105,7 +95,6 @@ namespace nana
bool caret_descriptor::visible() const
{
//return visible_; //deprecated
return (visible_state::invisible != visible_state_);
}
@ -119,22 +108,10 @@ namespace nana
size_ = s;
update();
//if(visible_) this->visible(true); //deprecated
if (visible_state::invisible != visible_state_)
visible(true);
}
/*
void caret_descriptor::_m_visible(bool isshow)
{
if(real_visible_state_ != isshow) //deprecated
{
real_visible_state_ = isshow;
native_interface::caret_visible(wd_->root, isshow && wd_->displayed());
}
}
*/
void caret_descriptor::update()
{
nana::point pos = point_;
@ -160,8 +137,6 @@ namespace nana
{
out_of_range_ = true;
//if(visible_)
// _m_visible(false); //deprecated
if (visible_state::invisible != visible_state_)
visible(false);
}
@ -188,8 +163,6 @@ namespace nana
if(out_of_range_)
{
//if(paint_size_ == size) //deprecated
// _m_visible(true);
if (paint_size_ == size)
visible(true);
@ -201,9 +174,6 @@ namespace nana
bool vs = (visible_state::invisible != visible_state_);
native_interface::caret_destroy(wd_->root);
native_interface::caret_create(wd_->root, size);
//real_visible_state_ = false; //deprecated
//if(visible_)
// _m_visible(true);
visible_state_ = visible_state::invisible;
if (vs)

3
source/gui/detail/window_manager.cpp
View File

@ -736,9 +736,6 @@ namespace detail
}
else if (effects::edge_nimbus::none != wd->effect.edge_nimbus)
{
//Update the nimbus effect
//using nimbus_renderer = detail::edge_nimbus_renderer<core_window_t>; //deprecated
//nimbus_renderer::instance().render(wd, true);
this->map(wd, true);
}
}

21
source/gui/widgets/combox.cpp
View File

@ -206,15 +206,11 @@ namespace nana
return true;
}
void set_mouse_over(bool mo)
void set_button_state(element_state state, bool reset_where)
{
state_.button_state = (mo ? element_state::hovered : element_state::normal);
state_.pointer_where = parts::none;
}
void set_mouse_press(bool mp)
{
state_.button_state = (mp ? element_state::pressed : element_state::hovered);
state_.button_state = state;
if (reset_where)
state_.pointer_where = parts::none;
}
void set_focused(bool f)
@ -600,7 +596,7 @@ namespace nana
void trigger::mouse_enter(graph_reference, const arg_mouse&)
{
drawer_->set_mouse_over(true);
drawer_->set_button_state(element_state::hovered, true);
if(drawer_->widget_ptr()->enabled())
{
drawer_->draw();
@ -610,7 +606,7 @@ namespace nana
void trigger::mouse_leave(graph_reference, const arg_mouse&)
{
drawer_->set_mouse_over(false);
drawer_->set_button_state(element_state::normal, true);
drawer_->editor()->mouse_enter(false);
if(drawer_->widget_ptr()->enabled())
{
@ -621,7 +617,8 @@ namespace nana
void trigger::mouse_down(graph_reference graph, const arg_mouse& arg)
{
drawer_->set_mouse_press(true);
//drawer_->set_mouse_press(true);
drawer_->set_button_state(element_state::pressed, false);
if(drawer_->widget_ptr()->enabled())
{
auto * editor = drawer_->editor();
@ -641,7 +638,7 @@ namespace nana
if (drawer_->widget_ptr()->enabled() && !drawer_->has_lister())
{
drawer_->editor()->mouse_up(arg.left_button, arg.pos);
drawer_->set_mouse_press(false);
drawer_->set_button_state(element_state::hovered, false);
drawer_->draw();
API::lazy_refresh();
}