Huw Davies : comdlg32: Simplify the margin initialization.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 680e5112e3a103d548e481a7f3c97922f45a059d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=680e5112e3a103d548e481a7f3...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Jan 15 10:45:25 2009 +0000

comdlg32: Simplify the margin initialization.

---

 dlls/comdlg32/printdlg.c |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index a8c5b4b..d28c5fe 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -3263,6 +3263,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     HWND 		hDrawWnd;
 
     if (uMsg == WM_INITDIALOG) { /*Init dialog*/
+        char str[100];
+
         pda = (PageSetupDataA*)lParam;
 	pda->hDlg   = hDlg; /* saving handle to main window to PageSetupDataA structure */
 	
@@ -3311,31 +3313,26 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	    EnableWindow(GetDlgItem(hDlg,rad1),FALSE);
 	    EnableWindow(GetDlgItem(hDlg,rad2),FALSE);
 	}
+
 	/* We fill them out enabled or not */
-	if (pda->dlga->Flags & PSD_MARGINS) {
-	    char str[100];
-	    _c_size2strA(pda,pda->dlga->rtMargin.left,str);
-	    SetDlgItemTextA(hDlg,edt4,str);
-	    _c_size2strA(pda,pda->dlga->rtMargin.top,str);
-	    SetDlgItemTextA(hDlg,edt5,str);
-	    _c_size2strA(pda,pda->dlga->rtMargin.right,str);
-	    SetDlgItemTextA(hDlg,edt6,str);
-	    _c_size2strA(pda,pda->dlga->rtMargin.bottom,str);
-	    SetDlgItemTextA(hDlg,edt7,str);
-	} else {
+        if (!(pda->dlga->Flags & PSD_MARGINS))
+        {
 	    /* default is 1 inch */
 	    DWORD size = _c_inch2size(pda->dlga,1000);
-	    char	str[20];
-	    _c_size2strA(pda,size,str);
-	    SetDlgItemTextA(hDlg,edt4,str);
-	    SetDlgItemTextA(hDlg,edt5,str);
-	    SetDlgItemTextA(hDlg,edt6,str);
-	    SetDlgItemTextA(hDlg,edt7,str);
             pda->dlga->rtMargin.left   = size;
             pda->dlga->rtMargin.top    = size;
             pda->dlga->rtMargin.right  = size;
             pda->dlga->rtMargin.bottom = size;
-	}
+        }
+        _c_size2strA(pda,pda->dlga->rtMargin.left,str);
+        SetDlgItemTextA(hDlg,edt4,str);
+        _c_size2strA(pda,pda->dlga->rtMargin.top,str);
+        SetDlgItemTextA(hDlg,edt5,str);
+        _c_size2strA(pda,pda->dlga->rtMargin.right,str);
+        SetDlgItemTextA(hDlg,edt6,str);
+        _c_size2strA(pda,pda->dlga->rtMargin.bottom,str);
+        SetDlgItemTextA(hDlg,edt7,str);
+
 	/* if paper disabled */
 	if (pda->dlga->Flags & PSD_DISABLEPAPER) {
 	    EnableWindow(GetDlgItem(hDlg,cmb2),FALSE);