From 42212e2c8d952d4ec1cfdac464885a824e8d3e89 Mon Sep 17 00:00:00 2001 From: ppescher Date: Sat, 5 Jun 2004 17:42:53 +0000 Subject: [PATCH] renamed some variables and struct members --- ResizableLib/ResizableSheet.cpp | 12 ++++++------ ResizableLib/ResizableSheetEx.cpp | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ResizableLib/ResizableSheet.cpp b/ResizableLib/ResizableSheet.cpp index 7495ca8..f9ffbee 100644 --- a/ResizableLib/ResizableSheet.cpp +++ b/ResizableLib/ResizableSheet.cpp @@ -202,8 +202,8 @@ BOOL CResizableSheet::ArrangeLayoutCallback(LAYOUTINFO &layout) const if (IsWizard()) // wizard mode { // use pre-calculated margins - layout.sizeMarginTL = m_sizePageTL; - layout.sizeMarginBR = m_sizePageBR; + layout.marginTopLeft = m_sizePageTL; + layout.marginBottomRight = m_sizePageBR; } else // tab mode { @@ -228,13 +228,13 @@ BOOL CResizableSheet::ArrangeLayoutCallback(LAYOUTINFO &layout) const pTab->SetRedraw(TRUE); // set margins - layout.sizeMarginTL = rectPage.TopLeft() - rectSheet.TopLeft(); - layout.sizeMarginBR = rectPage.BottomRight() - rectSheet.BottomRight(); + layout.marginTopLeft = rectPage.TopLeft() - rectSheet.TopLeft(); + layout.marginBottomRight = rectPage.BottomRight() - rectSheet.BottomRight(); } // set anchor types - layout.anchorTypeTL = TOP_LEFT; - layout.anchorTypeBR = BOTTOM_RIGHT; + layout.anchorTopLeft = TOP_LEFT; + layout.anchorBottomRight = BOTTOM_RIGHT; // use this layout info return TRUE; diff --git a/ResizableLib/ResizableSheetEx.cpp b/ResizableLib/ResizableSheetEx.cpp index 9b2a018..19a431f 100644 --- a/ResizableLib/ResizableSheetEx.cpp +++ b/ResizableLib/ResizableSheetEx.cpp @@ -241,14 +241,14 @@ BOOL CResizableSheetEx::ArrangeLayoutCallback(LAYOUTINFO &layout) const if (IsWizard()) // wizard mode { // use pre-calculated margins - layout.sizeMarginTL = m_sizePageTL; - layout.sizeMarginBR = m_sizePageBR; + layout.marginTopLeft = m_sizePageTL; + layout.marginBottomRight = m_sizePageBR; } else if (IsWizard97()) // wizard 97 { // use pre-calculated margins - layout.sizeMarginTL = m_sizePageTL; - layout.sizeMarginBR = m_sizePageBR; + layout.marginTopLeft = m_sizePageTL; + layout.marginBottomRight = m_sizePageBR; if (!(GetActivePage()->m_psp.dwFlags & PSP_HIDEHEADER)) { @@ -257,7 +257,7 @@ BOOL CResizableSheetEx::ArrangeLayoutCallback(LAYOUTINFO &layout) const GetTotalClientRect(&rectSheet); GetAnchorPosition(ID_WIZLINEHDR, rectSheet, rectLine); - layout.sizeMarginTL.cy = rectLine.bottom; + layout.marginTopLeft.cy = rectLine.bottom; } } else // tab mode @@ -283,13 +283,13 @@ BOOL CResizableSheetEx::ArrangeLayoutCallback(LAYOUTINFO &layout) const pTab->SetRedraw(TRUE); // set margins - layout.sizeMarginTL = rectPage.TopLeft() - rectSheet.TopLeft(); - layout.sizeMarginBR = rectPage.BottomRight() - rectSheet.BottomRight(); + layout.marginTopLeft = rectPage.TopLeft() - rectSheet.TopLeft(); + layout.marginBottomRight = rectPage.BottomRight() - rectSheet.BottomRight(); } // set anchor types - layout.anchorTypeTL = TOP_LEFT; - layout.anchorTypeBR = BOTTOM_RIGHT; + layout.anchorTopLeft = TOP_LEFT; + layout.anchorBottomRight = BOTTOM_RIGHT; // use this layout info return TRUE;