Merge pull request #7441 from ricardoquesada/cpp-template-mac

default OS Target for OS X is 10.7
fix Text line wrap issue
Merge pull request #7443 from andyque/fixTextLineWrap

fix text line wrap issue