diff --git a/ChangeLog b/ChangeLog
index e0ce985f4..426650b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
-2012-03-01  Richard Frith-Macdonald <rfm@gnu.org>
+2013-03-02 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+	* Source/NSMenuItemCell.m
+	* Headers/AppKit/NSMenuItemCell.h
+	  float -> CGFloat transitions
+
+2013-03-01  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Version ... bump subminor number in preparation for next release.
 
-2012-03-01  Richard Frith-Macdonald <rfm@gnu.org>
+2013-03-01  Richard Frith-Macdonald <rfm@gnu.org>
 
         Make release
 	* Version 0.23.0
diff --git a/Headers/AppKit/NSMenuItemCell.h b/Headers/AppKit/NSMenuItemCell.h
index 9bb25f983..41e9c7f1d 100644
--- a/Headers/AppKit/NSMenuItemCell.h
+++ b/Headers/AppKit/NSMenuItemCell.h
@@ -50,11 +50,11 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
   BOOL _needs_display;
   char _pad[1];
 
-  float _imageWidth;
-  float _titleWidth;
-  float _keyEquivalentWidth;
-  float _stateImageWidth;
-  float _menuItemHeight;
+  CGFloat _imageWidth;
+  CGFloat _titleWidth;
+  CGFloat _keyEquivalentWidth;
+  CGFloat _stateImageWidth;
+  CGFloat _menuItemHeight;
 
   NSImage *_imageToDisplay;
   NSString *_titleToDisplay;
@@ -76,10 +76,10 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
 - (void)setNeedsDisplay:(BOOL)flag;
 - (BOOL)needsDisplay;
 
-- (float)imageWidth;
-- (float)titleWidth;
-- (float)keyEquivalentWidth;
-- (float)stateImageWidth;
+- (CGFloat)imageWidth;
+- (CGFloat)titleWidth;
+- (CGFloat)keyEquivalentWidth;
+- (CGFloat)stateImageWidth;
 
 - (NSRect)imageRectForBounds:(NSRect)cellFrame;
 - (NSRect)keyEquivalentRectForBounds:(NSRect)cellFrame;
diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m
index 1a13b936a..1686d9125 100644
--- a/Source/NSMenuItemCell.m
+++ b/Source/NSMenuItemCell.m
@@ -268,7 +268,7 @@ static NSString *commandKeyString = @"#";
 {
   NSSize   componentSize;
   NSImage *anImage = nil;
-  float    neededMenuItemHeight = 20;
+  CGFloat  neededMenuItemHeight = 20;
  
   // Check if _mcell_belongs_to_popupbutton = NO while cell owned by 
   // popup button. FIXME
@@ -385,7 +385,7 @@ static NSString *commandKeyString = @"#";
   return _needs_display;
 }
 
-- (float) imageWidth
+- (CGFloat) imageWidth
 {
   if (_needs_sizing)
     [self calcSize];
@@ -393,7 +393,7 @@ static NSString *commandKeyString = @"#";
   return _imageWidth;
 }
 
-- (float) titleWidth
+- (CGFloat) titleWidth
 {
   if (_needs_sizing)
     [self calcSize];
@@ -401,7 +401,7 @@ static NSString *commandKeyString = @"#";
   return _titleWidth;
 }
 
-- (float) keyEquivalentWidth
+- (CGFloat) keyEquivalentWidth
 {
   if (_needs_sizing)
     [self calcSize];
@@ -409,7 +409,7 @@ static NSString *commandKeyString = @"#";
   return _keyEquivalentWidth;
 }
 
-- (float) stateImageWidth
+- (CGFloat) stateImageWidth
 {
   if (_needs_sizing)
     [self calcSize];
@@ -625,7 +625,7 @@ static NSString *commandKeyString = @"#";
     {
       if (_cell.is_bordered)
         {
-          float yDelta = [_control_view isFlipped] ? 1. : 2.;
+          CGFloat yDelta = [_control_view isFlipped] ? 1. : 2.;
           unsigned mask;
           NSRect interiorFrame;