From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 24 Nov 2007 09:38:08 +0000 (+0000)
Subject: 64bit mac adaptions
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0beae935af901b68ff7fe22ee9e0fce0076a4f64?ds=inline

64bit mac adaptions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index 25ab6194ee..150af08270 100644
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -66,6 +66,29 @@
     #define wxMAC_USE_COCOA 0
 #endif
 
+/*
+ * setting up 64 bit
+ */
+
+#ifdef __LP64__
+
+#undef wxMAC_USE_COCOA
+#define wxMAC_USE_COCOA 1
+
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
+
+#undef wxUSE_TASKBARICON
+#define wxUSE_TASKBARICON 0
+
+#undef wxUSE_TOOLTIPS
+#define wxUSE_TOOLTIPS 0
+
+
+
+#endif
+
+
 #endif
     /* _WX_MAC_CHKCONF_H_ */
 
diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index aa78392df7..5014a51d88 100644
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -152,7 +152,10 @@ private:
 */
 
 // app.h
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec);
+#endif
 
 #endif // wxUSE_GUI