X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c44090df7d361b28257d065d5980da6354111a18..e41e579f40ec15c8c20aa3118b7367281ae4f95b:/wxPython/src/helpers.h?ds=inline

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index 17c73fae13..55f28dbc7c 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;
@@ -459,14 +463,12 @@ public:
     // virtual int FilterEvent(wxEvent& event); // This one too????
 
 
-    static bool GetMacDefaultEncodingIsPC();
     static bool GetMacSupportPCMenuShortcuts();
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
-    static void SetMacDefaultEncodingIsPC(bool val);
     static void SetMacSupportPCMenuShortcuts(bool val);
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);