From be4cc9317b5aa0d528ea35c7e3682093f0702bef Mon Sep 17 00:00:00 2001
From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 1 Nov 2003 18:27:25 +0000
Subject: [PATCH] added conditional compilation for IntToFixed/FixedToInt for
 Mac OS X 10.3

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/dc.cpp | 17 +++++++++++------
 src/mac/dc.cpp        | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index aeded9e927..fa5e6ee117 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1256,14 +1256,19 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 	m_macFontInstalled = false ;
   return TRUE;
 }
+
+#ifndef IntToFixed
 inline Fixed	IntToFixed( int inInt )
-	{
-		return (((SInt32) inInt) << 16);
-	}
+{
+	return (((SInt32) inInt) << 16);
+}
+#endif
+#ifndef FixedToInt
 inline int	FixedToInt( Fixed inFixed )
-	{
-		return (((SInt32) inFixed) >> 16);
-	}
+{
+	return (((SInt32) inFixed) >> 16);
+}
+#endif
 
 void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
                               double angle)
diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index aeded9e927..fa5e6ee117 100644
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -1256,14 +1256,19 @@ bool  wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 	m_macFontInstalled = false ;
   return TRUE;
 }
+
+#ifndef IntToFixed
 inline Fixed	IntToFixed( int inInt )
-	{
-		return (((SInt32) inInt) << 16);
-	}
+{
+	return (((SInt32) inInt) << 16);
+}
+#endif
+#ifndef FixedToInt
 inline int	FixedToInt( Fixed inFixed )
-	{
-		return (((SInt32) inFixed) >> 16);
-	}
+{
+	return (((SInt32) inFixed) >> 16);
+}
+#endif
 
 void  wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
                               double angle)