mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add auto config of numeric conversions

Browse Source 
auto config of numeric conversions for GCC/MinGW
add contributors info
This commit is contained in:
Jinhao 2015-03-13 14:24:24 +08:00
parent 3062f70d83
commit bc8a157971
8 changed files with 54 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/nana/config.hpp
View File

@ -1,7 +1,7 @@
/* /*
* Nana Configuration * Nana Configuration
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -20,10 +20,13 @@
#define PLATFORM_SPEC_HPP <nana/detail/win32/platform_spec.hpp> #define PLATFORM_SPEC_HPP <nana/detail/win32/platform_spec.hpp>
//Test if it is MINGW //Test if it is MINGW
#if defined(__MINGW32__) #if defined(__MINGW32__) || defined(__MINGW64__)
#define NANA_MINGW #define NANA_MINGW
#define STD_CODECVT_NOT_SUPPORTED #define STD_CODECVT_NOT_SUPPORTED
//#define STD_THREAD_NOT_SUPPORTED //Use this flag if MinGW version is older than 4.8.1 #if (__GNUC__ == 4) && ((__GNUC_MINOR__ < 8) || (__GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1))
//Use this flag if MinGW version is older than 4.8.1
#define STD_THREAD_NOT_SUPPORTED
#endif
#endif #endif
#elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC) #elif (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)) && !defined(_CRAYC)
//Linux: //Linux:
@ -33,6 +36,13 @@
#define STD_CODECVT_NOT_SUPPORTED #define STD_CODECVT_NOT_SUPPORTED
#endif #endif
#if defined(NANA_MINGW) || defined(NANA_LINUX)
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8) && (__GNUC_PATCHLEVEL__ <= 1)
//Some functions which are specified in 21.5 Numeric conversions in Strings library have not yet implemented
#define STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED
#endif
#endif
//Here defines some flags that tell Nana what features will be supported. //Here defines some flags that tell Nana what features will be supported.
#define NANA_UNICODE #define NANA_UNICODE

4
include/nana/deploy.hpp
View File

@ -21,8 +21,8 @@
#undef NANA_WINDOWS #undef NANA_WINDOWS
#endif #endif
//Implement workarounds for MinGW //Implement workarounds for GCC/MinGW which version is below 4.8.2
#if defined(NANA_MINGW) #if defined(STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED)
namespace std namespace std
{ {
//Workaround for no implemenation of std::stoi in MinGW. //Workaround for no implemenation of std::stoi in MinGW.

12
include/nana/paint/detail/image_bmp.hpp
View File

@ -1,3 +1,15 @@
/*
* Bitmap Format Graphics Implementation
* Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
* @file: nana/paint/detail/image_bmp.hpp
* @contributors: Ryan Gonzalez
*/
#ifndef NANA_PAINT_DETAIL_IMAGE_BMP_HPP #ifndef NANA_PAINT_DETAIL_IMAGE_BMP_HPP
#define NANA_PAINT_DETAIL_IMAGE_BMP_HPP #define NANA_PAINT_DETAIL_IMAGE_BMP_HPP

1
source/basic_types.cpp
View File

@ -8,6 +8,7 @@
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/basic_types.cpp * @file: nana/basic_types.cpp
* @contributos: Jan
*/ */
#include <nana/basic_types.hpp> #include <nana/basic_types.hpp>

3
source/deploy.cpp
View File

@ -23,7 +23,8 @@
#include PLATFORM_SPEC_HPP #include PLATFORM_SPEC_HPP
#endif #endif
#if defined(NANA_MINGW) //Implement workarounds for GCC/MinGW which version is below 4.8.2
#if defined(STD_NUMERIC_CONVERSIONS_NOT_SUPPORTED)
#include <sstream> #include <sstream>
namespace std namespace std
{ {

2
source/gui/layout_utility.cpp
View File

@ -8,7 +8,7 @@
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/layout_utility.hpp * @file: nana/gui/layout_utility.hpp
* * @contributors: Ryan Gonzalez
* *
*/ */
#include <nana/gui/layout_utility.hpp> #include <nana/gui/layout_utility.hpp>

21
source/gui/notifier.cpp
View File

@ -1,14 +1,15 @@
/* /*
* Implementation of Notifier * Implementation of Notifier
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/notifier.cpp * @file: nana/gui/notifier.cpp
*/ * @contributors: Jan
*/
#include <nana/deploy.hpp> #include <nana/deploy.hpp>
#include <nana/gui/programming_interface.hpp> #include <nana/gui/programming_interface.hpp>
#include <nana/gui/notifier.hpp> #include <nana/gui/notifier.hpp>

24
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -1,15 +1,15 @@
/* /*
* A text editor implementation * A text editor implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2015 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt) * http://www.boost.org/LICENSE_1_0.txt)
* *
* @file: nana/gui/widgets/skeletons/text_editor.cpp * @file: nana/gui/widgets/skeletons/text_editor.cpp
* @description: * @contributors: qPCR4vir
*/ */
#include <nana/gui/widgets/skeletons/text_editor.hpp> #include <nana/gui/widgets/skeletons/text_editor.hpp>
#include <nana/gui/widgets/skeletons/textbase_export_interface.hpp> #include <nana/gui/widgets/skeletons/textbase_export_interface.hpp>
#include <nana/gui/element.hpp> #include <nana/gui/element.hpp>
@ -2528,7 +2528,7 @@ namespace nana{ namespace widgets
//The number of new lines minus one //The number of new lines minus one
const auto chp_end = text.data() + (begin == text.npos ? text.size() : begin); const auto chp_end = text.data() + (begin == text.npos ? text.size() : begin);
for (auto chp = text.data() + (pos + 1); chp != chp_end; ++chp) // + 2 for (auto chp = text.data() + (pos + 1); chp != chp_end; ++chp)
if (*chp == '\n') if (*chp == '\n')
lines.emplace_back(0, 0); lines.emplace_back(0, 0);