From a781a8790f3b769fa6229c46c591506befdc52ef Mon Sep 17 00:00:00 2001
From: Jinhao <cnjinhao@hotmail.com>
Date: Sun, 24 Jun 2018 15:49:32 +0800
Subject: [PATCH] remove deprecated code

---
 include/nana/paint/graphics.hpp               |  2 -
 source/gui/widgets/group.cpp                  |  8 +---
 source/gui/widgets/skeletons/content_view.cpp | 23 ++--------
 source/paint/graphics.cpp                     | 42 -------------------
 4 files changed, 5 insertions(+), 70 deletions(-)

diff --git a/include/nana/paint/graphics.hpp b/include/nana/paint/graphics.hpp
index c50714a3..4eed26a6 100644
--- a/include/nana/paint/graphics.hpp
+++ b/include/nana/paint/graphics.hpp
@@ -120,8 +120,6 @@ namespace nana
 			///Only supports the wide string, because it is very hard to specify the begin and end position in a UTF-8 string.
 			::nana::size glyph_extent_size(std::wstring_view text, std::size_t begin, std::size_t end) const;
 
-			//bool glyph_pixels(std::wstring_view text, unsigned* pxbuf) const;	//deprecated
-
 			/// Returns a buffer which stores the pixel of each charater stored in text.
 			/**
 			 * @param text The text to be requested.
diff --git a/source/gui/widgets/group.cpp b/source/gui/widgets/group.cpp
index fcb8719b..e9ece21a 100644
--- a/source/gui/widgets/group.cpp
+++ b/source/gui/widgets/group.cpp
@@ -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 + ">>";
diff --git a/source/gui/widgets/skeletons/content_view.cpp b/source/gui/widgets/skeletons/content_view.cpp
index 27899183..0596b4c6 100644
--- a/source/gui/widgets/skeletons/content_view.cpp
+++ b/source/gui/widgets/skeletons/content_view.cpp
@@ -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)
diff --git a/source/paint/graphics.cpp b/source/paint/graphics.cpp
index ec2aa75b..fbf07358 100644
--- a/source/paint/graphics.cpp
+++ b/source/paint/graphics.cpp
@@ -494,48 +494,6 @@ namespace paint
 			return sz;
 		}
 
-#if 0
-		bool graphics::glyph_pixels(std::wstring_view text, unsigned* pxbuf) const	//deprecated
-		{
-			if (nullptr == impl_->handle || nullptr == impl_->handle->context || nullptr == pxbuf) return false;
-
-			if (text.empty()) return true;
-
-			unsigned tab_pixels = impl_->handle->string.tab_length * impl_->handle->string.whitespace_pixels;
-#if defined(NANA_WINDOWS)
-			int * dx = new int[text.size()];
-			SIZE extents;
-			::GetTextExtentExPoint(impl_->handle->context, text.data(), static_cast<int>(text.size()), 0, 0, dx, &extents);
-
-			pxbuf[0] = (text[0] == '\t' ? tab_pixels : dx[0]);
-
-			for (std::size_t i = 1; i < text.size(); ++i)
-			{
-				pxbuf[i] = (text[i] == '\t' ? tab_pixels : dx[i] - dx[i - 1]);
-			}
-			delete[] dx;
-#elif defined(NANA_X11) && defined(NANA_USE_XFT)
-
-			auto disp = nana::detail::platform_spec::instance().open_display();
-			auto xft = reinterpret_cast<XftFont*>(impl_->handle->font->native_handle());
-
-			XGlyphInfo extents;
-			for (std::size_t i = 0; i < len; ++i)
-			{
-				if (text[i] != '\t')
-				{
-					FT_UInt glyphs = ::XftCharIndex(disp, xft, text[i]);
-					::XftGlyphExtents(disp, xft, &glyphs, 1, &extents);
-					pxbuf[i] = extents.xOff;
-				}
-				else
-					pxbuf[i] = tab_pixels;
-			}
-#endif
-			return true;
-		}
-#endif
-
 		std::unique_ptr<unsigned[]> graphics::glyph_pixels(std::wstring_view text) const
 		{
 			if (nullptr == impl_->handle || nullptr == impl_->handle->context) return {};