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

Fix tons of warnings in wxMSW after deprecating wxPen/wxBrush int styles &c.

Browse Source 
Replacement of FUTURE_WXWIN_COMPATIBILITY_3_0 with WXWIN_COMPATIBILITY_3_0 in
r75532 resulted in tons of warnings as all code using wxSOLID and similar
constants now uses the deprecated methods taking int instead of the preferred
ones taking wx{Pen,Brush}Style (and similarly for wxFont{Style,Weight,Family}).

Fix all of them but this also would seem to mean that this change might not be
such a good idea at all.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-04 22:20:36 +00:00
parent 6870e04cef
commit a49d3f4161
12 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/propgrid/advprops.cpp
View File

@@ -751,7 +751,7 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
st != wxFONTSTYLE_SLANT &&
st != wxFONTSTYLE_ITALIC )
st = wxFONTWEIGHT_NORMAL;
font.SetStyle( st );
font.SetStyle( static_cast<wxFontStyle>(st) );
}
else if ( ind == 3 )
{
@@ -760,7 +760,7 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
wt != wxFONTWEIGHT_LIGHT &&
wt != wxFONTWEIGHT_BOLD )
wt = wxFONTWEIGHT_NORMAL;
font.SetWeight( wt );
font.SetWeight( static_cast<wxFontWeight>(wt) );
}
else if ( ind == 4 )
{
@@ -769,10 +769,10 @@ wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
else if ( ind == 5 )
{
int fam = childValue.GetLong();
if ( fam < wxDEFAULT ||
fam > wxTELETYPE )
fam = wxDEFAULT;
font.SetFamily( fam );
if ( fam < wxFONTFAMILY_DEFAULT ||
fam > wxFONTFAMILY_TELETYPE )
fam = wxFONTFAMILY_DEFAULT;
font.SetFamily( static_cast<wxFontFamily>(fam) );
}
wxVariant newVariant;