diff --git a/.gitignore b/.gitignore
index f6f1e54d..318a153e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,10 +21,12 @@ Thumbs.db
[Bb]in
[Dd]ebug*/
*.lib
+*.a
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
*.suo
-*.sdf
\ No newline at end of file
+*.sdf
+lib/
diff --git a/build/vc2013/nana.sln b/build/vc2013/nana.sln
index 6baefd4a..3d18acf9 100644
--- a/build/vc2013/nana.sln
+++ b/build/vc2013/nana.sln
@@ -1,20 +1,26 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nana", "nana.vcxproj", "{25B21068-491B-4A9F-B99F-6C27BF31BAAD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|Win32.ActiveCfg = Debug|Win32
{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|Win32.Build.0 = Debug|Win32
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.ActiveCfg = Debug|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Debug|x64.Build.0 = Debug|x64
{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|Win32.ActiveCfg = Release|Win32
{25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|Win32.Build.0 = Release|Win32
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.ActiveCfg = Release|x64
+ {25B21068-491B-4A9F-B99F-6C27BF31BAAD}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj
index d6b6e976..c8024ba7 100644
--- a/build/vc2013/nana.vcxproj
+++ b/build/vc2013/nana.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{25B21068-491B-4A9F-B99F-6C27BF31BAAD}
@@ -22,6 +30,12 @@
v120
Unicode
+
+ StaticLibrary
+ true
+ v120
+ Unicode
+
StaticLibrary
false
@@ -29,21 +43,48 @@
true
Unicode
+
+ StaticLibrary
+ false
+ v120
+ true
+ Unicode
+
+
+
+
+
+
+
../bin/vc2013/
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+
+
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ ../bin/vc2013/
../bin/vc2013/
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+
+
+ ..\..\include;$(IncludePath)
+ ..\..\source;$(VC_SourcePath);
+ ../bin/vc2013/
@@ -52,13 +93,31 @@
Level3
Disabled
WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
Windows
true
- $(OutDir)\nana_debug.lib
+ $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ Windows
+ true
+
+
+ $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
@@ -70,6 +129,7 @@
true
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
Windows
@@ -78,7 +138,28 @@
true
- $(OutDir)\nana_release.lib
+ $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ Windows
+ true
+ true
+ true
+
+
+ $(OutDir)\nana_$(ConfigurationName)_$(PlatformShortName).lib
diff --git a/extrlib/readme (2).txt b/extrlib/readme (2).txt
new file mode 100644
index 00000000..84359ae5
--- /dev/null
+++ b/extrlib/readme (2).txt
@@ -0,0 +1 @@
+The libpng.a is for MinGW(Not linux), and other .lib files are for VS2013
\ No newline at end of file
diff --git a/include/nana/basic_types.hpp b/include/nana/basic_types.hpp
index 9a2d85f2..2e8c0929 100644
--- a/include/nana/basic_types.hpp
+++ b/include/nana/basic_types.hpp
@@ -18,7 +18,7 @@
namespace nana
{
- //A constant value for the invalid position.
+ /// A constant value for the invalid position.
const std::size_t npos = static_cast(-1);
@@ -127,8 +127,7 @@ namespace nana
using pixel_color_t = pixel_argb_t;
- //http://www.w3.org/TR/2011/REC-css3-color-20110607/
- //4.3. Extended color keywords
+ /// See extended CSS color keywords (4.3) in http://www.w3.org/TR/2011/REC-css3-color-20110607/
enum class colors
{
alice_blue = 0xf0f8ff,
@@ -320,10 +319,10 @@ namespace nana
color blend(const color& bgcolor, bool ignore_bgcolor_alpha) const;
- ///< Blends two colors with the specified alpha, and the alpha values that come with these two colors are both ignored.
+ /// Blends two colors with the specified alpha, and the alpha values that come with these two colors are both ignored.
color blend(const color& bgcolor, double alpha) const;
- ///< Determines whether the color is completely transparent.
+ /// Determines whether the color is completely transparent.
bool invisible() const;
pixel_color_t px_color() const;
pixel_argb_t argb() const;
diff --git a/source/gui/widgets/skeletons/text_editor.cpp b/source/gui/widgets/skeletons/text_editor.cpp
index f8ffa7f0..e5125c9c 100644
--- a/source/gui/widgets/skeletons/text_editor.cpp
+++ b/source/gui/widgets/skeletons/text_editor.cpp
@@ -2528,7 +2528,7 @@ namespace nana{ namespace widgets
//The number of new lines minus one
const auto chp_end = text.data() + (begin == text.npos ? text.size() : begin);
- for (auto chp = text.data() + (pos + 2); chp != chp_end; ++chp)
+ for (auto chp = text.data() + (pos + 1); chp != chp_end; ++chp) // + 2
if (*chp == '\n')
lines.emplace_back(0, 0);