Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lots of warnings reported by Clang.

Browse Source 
Mostly potentially lossy implicit conversions in headers (long->int). Also dangling else warnings. Struct/class mismatches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-10 16:41:34 +00:00
parent 8778519200
commit 17473a770a
23 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/html/htmlcell.h
View File

@@ -345,9 +345,9 @@ protected:
wxHtmlContainerCell *m_Parent;
// dimensions of fragment (m_Descent is used to position text & images)
long m_Width, m_Height, m_Descent;
int m_Width, m_Height, m_Descent;
// position where the fragment is drawn:
long m_PosX, m_PosY;
int m_PosX, m_PosY;
// superscript/subscript/normal:
wxHtmlScriptMode m_ScriptMode;

6
include/wx/html/htmltag.h
View File

@@ -165,9 +165,9 @@ private:
#if WXWIN_COMPATIBILITY_2_8
inline int wxHtmlTag::GetBeginPos() const { return m_Begin - m_sourceStart; }
inline int wxHtmlTag::GetEndPos1() const { return m_End1 - m_sourceStart; }
inline int wxHtmlTag::GetEndPos2() const { return m_End2 - m_sourceStart; }
inline int wxHtmlTag::GetBeginPos() const { return int(m_Begin - m_sourceStart); }
inline int wxHtmlTag::GetEndPos1() const { return int(m_End1 - m_sourceStart); }
inline int wxHtmlTag::GetEndPos2() const { return int(m_End2 - m_sourceStart); }
#endif // WXWIN_COMPATIBILITY_2_8

2
include/wx/html/winpars.h
View File

@@ -204,7 +204,7 @@ private:
// actual hypertext link or empty string
bool m_UseLink;
// true if m_Link is not empty
long m_CharHeight, m_CharWidth;
int m_CharHeight, m_CharWidth;
// average height of normal-sized text
int m_Align;
// actual alignment