From 2034324361f674e235743dcb2ac460e17bd21158 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 23 Sep 2003 16:28:19 +0000
Subject: [PATCH] Moved the hack for the Carbon header compile error to
 helpers.h so other modules will see it if needed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/contrib/glcanvas/glcanvas.i | 4 ----
 wxPython/src/helpers.h               | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wxPython/contrib/glcanvas/glcanvas.i b/wxPython/contrib/glcanvas/glcanvas.i
index d8f7bdaada..306fc74acd 100644
--- a/wxPython/contrib/glcanvas/glcanvas.i
+++ b/wxPython/contrib/glcanvas/glcanvas.i
@@ -16,10 +16,6 @@
 %{
 #include "wxPython.h"
 
-#ifdef __WXMAC__  // avoid a bug in Carbon headers
-#define scalb scalbn
-#endif
-
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 4aff1d0e95..90451fd598 100644
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -16,6 +16,10 @@
 #include <wx/wx.h>
 #include <wx/geometry.h>
 
+//---------------------------------------------------------------------------
+#ifdef __WXMAC__  // avoid a bug in Carbon headers
+#define scalb scalbn
+#endif
 //---------------------------------------------------------------------------
 
 typedef unsigned char byte;