From cc2180a5b0ba02eb2d7cfcffcf4a0c3133f560b3 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Sat, 17 Nov 2007 17:43:10 +0000
Subject: [PATCH] - main menu bar was a bit wide

git-svn-id: trunk@12908 -
---
 lcl/interfaces/win32/win32wsmenus.pp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lcl/interfaces/win32/win32wsmenus.pp b/lcl/interfaces/win32/win32wsmenus.pp
index 0735ed7e55..d68088ff02 100644
--- a/lcl/interfaces/win32/win32wsmenus.pp
+++ b/lcl/interfaces/win32/win32wsmenus.pp
@@ -203,8 +203,7 @@ var
   AnsiBuffer: ansistring;
   WideBuffer: widestring;
 begin
-  tmpRect.right := 0;
-  tmpRect.left := 0;
+  FillChar(tmpRect, SizeOf(tmpRect), 0);
   newFont := getMenuItemFont(aDecoration);
   oldFont := SelectObject(aHDC, newFont);
 {$ifdef WindowsUnicodeSupport}
@@ -335,11 +334,13 @@ begin
   inc(Result.cx, LeftCaptionPosition(aMenuItem));
 
   if not aMenuItem.IsInMenuBar then
-    inc(Result.cx, SpaceBetweenIcons);
+    inc(Result.cx, SpaceBetweenIcons)
+  else
+    dec(Result.cx, SpaceBetweenIcons);
 
-  if aMenuItem.ShortCut <> scNone then
+  if (aMenuItem.ShortCut <> scNone) then
     Inc(Result.cx, spaceBetweenIcons);
-	
+
   minimumHeight := GetSystemMetrics(SM_CYMENU);
   if not aMenuItem.IsInMenuBar then
     Dec(minimumHeight, 2);