Use GetFont not m_font for GetCharHeight

[wxWidgets.git] / src / generic / laywin.cpp

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index b9571b23be68a78fc6ee44ff1daa0f31b5f6acd3..524f4bf45a4c801a9e437f5fdf56532d71d98db1 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -159,12 +159,12 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
     {
         // If not in query mode, resize the window.
         // TODO: add wxRect& form to wxWindow::SetSize
-        wxSize sz = GetSize();
+        wxSize sz2 = GetSize();
         wxPoint pos = GetPosition();
         SetSize(thisRect.x, thisRect.y, thisRect.width, thisRect.height);
 
         // Make sure the sash is erased when the window is resized
-        if ((pos.x != thisRect.x || pos.y != thisRect.y || sz.x != thisRect.width || sz.y != thisRect.height) &&
+        if ((pos.x != thisRect.x || pos.y != thisRect.y || sz2.x != thisRect.width || sz2.y != thisRect.height) &&
             (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT)))
             Refresh(true);