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 25ab6194ee3f3ed15aec8a704085b21c2586e13b..150af0827055710b95cbefac8590da35963314f4 100644 (file)
--- 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 aa78392df7f110bc6460ebe425b35b33ac919f11..5014a51d8822bcd715f6c7777c41d27108bd1f46 100644 (file)
--- 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