rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34 from StDH/v0.7-dev 

Fixed warnings in Visual Studio
0.8
Bruno Van de Velde 2015-02-02 14:58:10 +01:00
parent 9d221eea99 198a66b813
commit 467c53b1ad
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/TGUI/Clipboard.cpp
View File

@ -83,7 +83,12 @@ namespace tgui
char* pchData = static_cast<char*>(GlobalLock(hGlobal));
if (pchData != NULL)
{
strcpy(pchData, m_contents.toAnsiString().c_str());
#if defined(_MSC_VER)
strcpy_s(pchData, sizeof(pchData), m_contents.toAnsiString().c_str());
#else
strcpy(pchData, m_contents.toAnsiString().c_str());
#endif
SetClipboardData(CF_TEXT, hGlobal);
GlobalUnlock(hGlobal);

2
src/TGUI/Layout.cpp
View File

@ -28,6 +28,8 @@
#include <cassert>
#pragma warning(disable: 4503)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
namespace tgui

2
src/TGUI/TextBox.cpp
View File

@ -421,7 +421,7 @@ namespace tgui
// Calculate the height of one line
if (m_font)
m_lineHeight = m_font->getLineSpacing(m_textSize);
m_lineHeight = static_cast<unsigned int>(m_font->getLineSpacing(m_textSize));
else
m_lineHeight = 0;

2
src/TGUI/ThemeFileParser.cpp
View File

@ -40,6 +40,8 @@
#include <android/configuration.h>
#endif
#pragma warning(disable: 4503)
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
namespace tgui