Addressed changes requested in PR 201

Headers/Additions/GNUstepGUI/GSTheme.h

@@ -1522,8 +1522,8 @@ withRepeatedImage: (NSImage*)image
  * Modifies the proposed default width for a menu title in the given NSMenuView. 
  * The default implementation simply returns the proposed width unmodified.
  */
-- (float) proposedTitleWidth: (float)proposedWidth
-		 forMenuView: (NSMenuView *)aMenuView;
+- (CGFloat) proposedTitleWidth: (CGFloat)proposedWidth
+		   forMenuView: (NSMenuView *)aMenuView;
 
 /**
  * Modifies the proposed key equivalent string for the menu item. The default

Source/GSThemeDrawing.m

@@ -2084,7 +2084,7 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
 				    buttonSize.height)];
 }
 
-- (NSRect) minimizeButtonFrameForBounds: (NSRect)bounds
+- (NSRect) closeButtonFrameForBounds: (NSRect)bounds
 {
   GSTheme *theme = [GSTheme theme];
 

Source/GSThemeMenu.m

@@ -182,8 +182,8 @@
   return aRect;
 }
 
-- (float) proposedTitleWidth: (float)proposedWidth
-		 forMenuView: (NSMenuView *)aMenuView
+- (CGFloat) proposedTitleWidth: (CGFloat)proposedWidth
+		   forMenuView: (NSMenuView *)aMenuView
 {
   return proposedWidth;
 }

Source/NSMenu.m

@@ -265,8 +265,6 @@ static BOOL menuBarVisible = YES;
   NSString *servicesString = _(@"Services");
   int i;
 
-  
-
   if ([self _isMain])
     {
       NSString *appTitle;

Source/NSMenuView.m

@@ -789,10 +789,10 @@ static float menuBarHeight = 0.0;
         {
           GSCellRect elem;
           NSMenuItemCell *aCell = [self menuItemCellForItemAtIndex: i];
-          float titleWidth = [aCell titleWidth];
+          CGFloat titleWidth = [aCell titleWidth];
 
 	  titleWidth = [[GSTheme theme] proposedTitleWidth: titleWidth
-					  forMenuView: self];
+					       forMenuView: self];
 
           if ([aCell imageWidth])
             {