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
2018-06-24 15:49:32 +08:00
parent 03336210a5
commit a781a8790f
4 changed files with 5 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/widgets/group.cpp
View File

@@ -71,9 +71,7 @@ namespace nana{
caption_dimension.width += 1;
std::string div = "vert margin=[0," + std::to_string(gap) + "," + std::to_string(gap + 5) + "," + std::to_string(gap) + "]";
#if 0
div += "<weight=" + std::to_string(caption_dimension.height) + " <weight=5><" + field_title + " weight=" + std::to_string(caption_dimension.width + 1) + ">>";
#else
div += "<weight=" + std::to_string(caption_dimension.height) + " ";
if (align::left == caption_align)
@@ -88,9 +86,7 @@ namespace nana{
else if (align::center == caption_align)
div += "<>";
div += ">";
#endif
div += "<<vert margin=5 " + std::string(field_options) + ">";
div += "><<vert margin=5 " + std::string(field_options) + ">";
if (!usr_div_str.empty())
div += "<" + usr_div_str + ">>";

23
source/gui/widgets/skeletons/content_view.cpp
View File

@@ -85,27 +85,10 @@ namespace nana {
cv_scroll(std::make_shared<cv_scroll_rep>())
{
API::events(handle).mouse_wheel.connect_unignorable([this](const arg_wheel& arg) {
#if 0
scroll_interface * scroll = nullptr;
switch (arg.which)
{
case arg_wheel::wheel::vertical:
scroll = &vert;
break;
case arg_wheel::wheel::horizontal:
scroll = &horz;
break;
default:
//Other button is not unsupported.
return;
}
#else
auto const scroll = cv_scroll->scroll(arg.which);
if (nullptr == scroll)
return;
#endif
if (!API::empty_window(arg.window_handle))
auto const scroll = cv_scroll->scroll(arg.which);
if (scroll && (!API::empty_window(arg.window_handle)))
{
auto align_px = (scroll->value() % scroll->step());
if (align_px)