From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Mon, 12 Oct 2009 00:28:30 +0000 (+0000)
Subject: 2009-10-11  Adrian Robert  <Adrian.B.Robert@gmail.com>
X-Git-Tag: emacs-pretest-23.1.90~837
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf6c75c9675cae46afc82ad87dfdb4fe413a5114;p=emacs.git

2009-10-11  Adrian Robert  <Adrian.B.Robert@gmail.com>
	Changes for 64-bit compile under Snow Leopard.

	* nsfns.m (xw-color-values): Use CGFloat where appropriate.

	* nsfont.m (ns_char_width): Replace deprecated call (suggested by
	Erik Charlebois).
	(ns_findfonts, nsfont_list_family): Use long format in printf, and
	cast argument.
	(nsfont_open): Use ns_char_width() everywhere.
	(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where
	appropriate.

	* nsgui.h (NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat.

	* nsimage.m (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat
	where appropriate.

	* nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger
	where appropriate.
	(EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use
	stringWithUTF8String.
	(EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature.

	* nsterm.h (EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add
	formal protocol mention to inheritance.
	[NS_HAVE_NSINTEGER]: Drop conditional and contents.

	* nsterm.m (ns_color_to_lisp): Use CGFloat where appropriate.  Fix
	printf format.
	(ns_query_color): Use CGFloat where appropriate.
	(EmacsView<NSTextInput>, EmacsScroller): Fix method signatures.
	(EmacsScroller-mouseDown:) Use long format in printf, and cast
	argument.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 02aa2d5cd65..c462146157c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2009-10-11  Adrian Robert  <Adrian.B.Robert@gmail.com>
+	Changes for 64-bit compile under Snow Leopard.
+
+	* nsfns.m (xw-color-values): Use CGFloat where appropriate.
+
+	* nsfont.m (ns_char_width): Replace deprecated call (suggested by
+	Erik Charlebois).
+	(ns_findfonts, nsfont_list_family): Use long format in printf, and
+	cast argument.
+	(nsfont_open): Use ns_char_width() everywhere.
+	(ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where
+	appropriate.
+
+	* nsgui.h (NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat.
+
+	* nsimage.m (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat
+	where appropriate.
+
+	* nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger
+	where appropriate.
+	(EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use
+	stringWithUTF8String.
+	(EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature.
+
+	* nsterm.h (EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add
+	formal protocol mention to inheritance.
+	[NS_HAVE_NSINTEGER]: Drop conditional and contents.
+
+	* nsterm.m (ns_color_to_lisp): Use CGFloat where appropriate.  Fix
+	printf format.
+	(ns_query_color): Use CGFloat where appropriate.
+	(EmacsView<NSTextInput>, EmacsScroller): Fix method signatures.
+	(EmacsScroller-mouseDown:) Use long format in printf, and cast
+	argument.
+
 2009-10-11  Glenn Morris  <rgm@gnu.org>
 
 	* frame.c (Fframe_pixel_height): Doc fix.  (Bug#4535)