From 50ec5227266e6508d0ebc2f1dafd3e22d81aec60 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Fri, 16 Dec 2016 07:17:10 +0100
Subject: [PATCH] Require ncursesw to provide waddwstr and waddnwstr

---
 configure.ac   | 10 ++--------
 src/window.cpp | 12 ------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6fc5722e..0fb34099 100644
--- a/configure.ac
+++ b/configure.ac
@@ -186,8 +186,6 @@ AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread",
 dnl =========================
 dnl = checking for ncursesw =
 dnl =========================
-AH_TEMPLATE([NCURSES_WADDWSTR], [ncursesw has waddwstr function])
-AH_TEMPLATE([NCURSES_WADDNWSTR], [ncursesw has waddnwstr function])
 PKG_CHECK_MODULES([ncursesw], [ncursesw], [
 	AC_SUBST(ncursesw_CFLAGS)
 	AC_SUBST(ncursesw_LIBS)
@@ -198,12 +196,8 @@ PKG_CHECK_MODULES([ncursesw], [ncursesw], [
 		AC_MSG_ERROR([missing curses.h header])
 	)
   AC_CHECK_LIB(ncursesw, initscr, , AC_MSG_ERROR([ncursesw doesn't provide initscr]))
-  AC_CHECK_LIB(ncursesw, waddwstr,
-    AC_DEFINE([NCURSES_WADDWSTR], [1], []),
-    AC_DEFINE([NCURSES_WADDWSTR], [0], []))
-  AC_CHECK_LIB(ncursesw, waddnwstr,
-    AC_DEFINE([NCURSES_WADDNWSTR], [1], []),
-    AC_DEFINE([NCURSES_WADDNWSTR], [0], []))
+  AC_CHECK_LIB(ncursesw, waddwstr, , AC_MSG_ERROR([ncursesw doesn't provide waddwstr]))
+  AC_CHECK_LIB(ncursesw, waddnwstr, , AC_MSG_ERROR([ncursesw doesn't provide waddnwstr]))
 ],
 	AC_MSG_ERROR([ncursesw is required!])
 )
diff --git a/src/window.cpp b/src/window.cpp
index de5e2954..a58c6b8f 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1345,21 +1345,13 @@ Window &Window::operator<<(char c)
 
 Window &Window::operator<<(const wchar_t *ws)
 {
-#if NCURSES_WADDWSTR
 	waddwstr(m_window, ws);
-#else
-	wprintw(m_window, "%ls", ws);
-#endif // NCURSES_WADDWSTR
 	return *this;
 }
 
 Window &Window::operator<<(wchar_t wc)
 {
-#if NCURSES_WADDNWSTR
 	waddnwstr(m_window, &wc, 1);
-#else
-	wprintw(m_window, "%lc", wc);
-#endif // NCURSES_WADDNWSTR
 	return *this;
 }
 
@@ -1383,11 +1375,7 @@ Window &Window::operator<<(const std::string &s)
 
 Window &Window::operator<<(const std::wstring &ws)
 {
-#if NCURSES_WADDNWSTR
 	waddnwstr(m_window, ws.c_str(), ws.length());
-#else
-	wprintw(m_window, "%lc", ws.c_str());
-#endif // NCURSES_WADDNWSTR
 	return *this;
 }