diff --git a/ChangeLog b/ChangeLog
index 55b1345da..1040cb21f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-26  Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
+
+	* Source/NSFontPanel.m
+	* Some int -> NSInteger and float -> CGFloat transitions
+
 2014-01-24  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSTextView.m (-doCommandBySelector:): Pass nil argument
diff --git a/Source/NSFontPanel.m b/Source/NSFontPanel.m
index da90e22e8..79dc40230 100644
--- a/Source/NSFontPanel.m
+++ b/Source/NSFontPanel.m
@@ -1106,7 +1106,7 @@ static int score_difference(int weight1, int traits1,
 }
 
 
-- (int) browser: (NSBrowser*)sender  numberOfRowsInColumn: (int)column
+- (NSInteger) browser: (NSBrowser*)sender  numberOfRowsInColumn: (NSInteger)column
 {
   switch ([sender tag])
     {
@@ -1129,7 +1129,7 @@ static int score_difference(int weight1, int traits1,
     }
 }
 
-- (NSString*) browser: (NSBrowser*)sender  titleOfColumn: (int)column
+- (NSString*) browser: (NSBrowser*)sender  titleOfColumn: (NSInteger)column
 {
   switch ([sender tag])
     {
@@ -1188,7 +1188,7 @@ static int score_difference(int weight1, int traits1,
 }
 
 - (BOOL) browser: (NSBrowser *)sender 
-   isColumnValid: (int)column;
+   isColumnValid: (NSInteger)column;
 {
   return NO;
 }
@@ -1198,9 +1198,9 @@ static int score_difference(int weight1, int traits1,
 @implementation NSFontPanel (NSSplitViewDelegate)
 
 - (void) splitView: (NSSplitView *)splitView  
-constrainMinCoordinate: (float *)min 
-     maxCoordinate: (float *)max
-       ofSubviewAt: (int)offset
+constrainMinCoordinate: (CGFloat *)min 
+     maxCoordinate: (CGFloat *)max
+       ofSubviewAt: (NSInteger)offset
 {
   *max = *max - 100;
 }