diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index 1f0ea10349..f6aeee9aa2 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -2969,7 +2969,6 @@ bool wxPropertyGrid::PerformValidation( wxPGProperty* p, wxVariant& pendingValue // // Adapt list to child values, if necessary - wxVariant listValue = pendingValue; wxVariant* pPendingValue = &pendingValue; wxVariant* pList = NULL; @@ -2983,7 +2982,7 @@ bool wxPropertyGrid::PerformValidation( wxPGProperty* p, wxVariant& pendingValue wxPGProperty* baseChangedProperty = changedProperty; wxVariant bcpPendingList; - listValue = pendingValue; + wxVariant listValue = pendingValue; listValue.SetName(p->GetBaseName()); while ( pwc && diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 39f0c5993b..43ddacced4 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -5115,8 +5115,6 @@ bool wxRichTextParagraph::Layout(wxDC& dc, wxRichTextDrawingContext& context, co // The descent for the whole line at this point, is the correct max descent maxDescent = childDescent; - // Maximum ascent - maxAscent = actualSize.y-childDescent; // lineHeight is given by the height for the whole line, since it will // take into account ascend/descend.