1 files changed, 12 insertions, 11 deletions

diff --git a/src/T2DLL/T2DlgItemTable.cpp b/src/T2DLL/T2DlgItemTable.cpp
index 4382ef4..1af0ee4 100644
--- a/src/T2DLL/T2DlgItemTable.cpp
+++ b/src/T2DLL/T2DlgItemTable.cpp
@@ -265,6 +265,7 @@ BOOL TableCellIterator::Next(TableCellT& newCurrent) {
 }
 
 /*virtual*/ BOOL T2DlgItemTable::OnT2DlgItemEraseBkgnd(CDC* dc) {
+#pragma var_order(clipRect, bottomRightCell, bottomRight, pen, save, topLeft, topLeftCell, clientRect, i)
     int save = dc->SaveDC();
 
     dc->SelectPalette(mPalette, false);
@@ -276,8 +277,8 @@ BOOL TableCellIterator::Next(TableCellT& newCurrent) {
     if (mShowHScroller && mShowVScroller) {
         CRect insideRect;
         GetClientRect(insideRect);
-        insideRect.right -= 16;
-        insideRect.bottom -= 16;
+        insideRect.left = insideRect.right - 16;
+        insideRect.top = insideRect.bottom - 16;
 
         dc->SelectObject(pen);
         dc->MoveTo(insideRect.right - 1, insideRect.top);
@@ -457,14 +458,14 @@ BOOL T2DlgItemTable::Resized() {
     clientRect.right -= mShowVScroller ? 16 : 0;
     clientRect.bottom -= mShowHScroller ? 16 : 0;
 
-    CRect tableRect;
-    tableRect.left = 0;
-    tableRect.top = 0;
-    tableRect.right = mColWidth * mCols;
-    tableRect.right = mRowHeight * mRows;
+    CRect interiorRect;
+    interiorRect.left = 0;
+    interiorRect.top = 0;
+    interiorRect.right = mColWidth * mCols;
+    interiorRect.bottom = mRowHeight * mRows;
 
     if (
-        (mHScrollerStyle == ShowIfNeeded && tableRect.Width() > clientRect.Width()) ||
+        (mHScrollerStyle == ShowIfNeeded && interiorRect.Width() > clientRect.Width()) ||
             mHScrollerStyle == AlwaysShow
         )
     {
@@ -475,7 +476,7 @@ BOOL T2DlgItemTable::Resized() {
     }
 
     if (
-        (mHScrollerStyle == ShowIfNeeded && tableRect.Width() <= clientRect.Width()) ||
+        (mHScrollerStyle == ShowIfNeeded && interiorRect.Width() <= clientRect.Width()) ||
         (mHScrollerStyle != ShowIfNeeded && mHScrollerStyle != AlwaysShow)
         )
     {
@@ -486,7 +487,7 @@ BOOL T2DlgItemTable::Resized() {
     }
 
     if (
-        (mVScrollerStyle == ShowIfNeeded && tableRect.Height() > clientRect.Height()) ||
+        (mVScrollerStyle == ShowIfNeeded && interiorRect.Height() > clientRect.Height()) ||
             mVScrollerStyle == AlwaysShow
         )
     {
@@ -497,7 +498,7 @@ BOOL T2DlgItemTable::Resized() {
     }
 
     if (
-        (mVScrollerStyle == ShowIfNeeded && tableRect.Height() <= clientRect.Height()) ||
+        (mVScrollerStyle == ShowIfNeeded && interiorRect.Height() <= clientRect.Height()) ||
         (mVScrollerStyle != ShowIfNeeded && mVScrollerStyle != AlwaysShow)
         )
     {