From c35deb3b94921f02e914a6b89f6c01644d84b19d Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 6 Sep 2009 12:00:46 +0200 Subject: [PATCH] move override wcwidth with 1 if WIN32 if defined to window.h --- src/window.cpp | 5 ----- src/window.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/window.cpp b/src/window.cpp index b8629c9a..ba765409 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -23,11 +23,6 @@ #include "window.h" -/// FIXME: dirty workaround. -#ifdef WIN32 -# define wcwidth(x) 1 -#endif // WIN32 - using namespace NCurses; void NCurses::InitScreen(GNUC_UNUSED const char *window_title, bool enable_colors) diff --git a/src/window.h b/src/window.h index 93a1373f..4be700ad 100644 --- a/src/window.h +++ b/src/window.h @@ -57,6 +57,11 @@ # define TO_WSTRING(x) (x) #endif +// workaraund for win32 +#ifdef WIN32 +# define wcwidth(x) 1 +#endif + std::string ToString(const std::wstring &); std::wstring ToWString(const std::string &);