From 4114d0af4f09cca11a19121b0c4fcf4e9a2ad72c Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Thu, 10 May 2001 20:52:48 +0000 Subject: [PATCH] corrected conditional compilation for Universal Interfaces (3.4 or later) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/app.cpp | 10 +++++----- src/mac/carbon/app.cpp | 10 +++++----- src/mac/carbon/control.cpp | 2 +- src/mac/carbon/timer.cpp | 2 +- src/mac/control.cpp | 2 +- src/mac/timer.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 314d307ec8..f54dbe1e63 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -353,14 +353,14 @@ bool wxApp::Initialize() SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; -#ifdef __UNIX__ - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , AEHandleODoc , +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp , + AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , AEHandlePDoc , + AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerUPP(AEHandlePDoc) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit , + AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) , (long) wxTheApp , FALSE ) ; #else AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerProc(AEHandleODoc) , diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 314d307ec8..f54dbe1e63 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -353,14 +353,14 @@ bool wxApp::Initialize() SetEventMask( everyEvent ) ; UMAShowWatchCursor() ; -#ifdef __UNIX__ - AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , AEHandleODoc , +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) + AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerUPP(AEHandleODoc) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp , + AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , AEHandlePDoc , + AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments , NewAEEventHandlerUPP(AEHandlePDoc) , (long) wxTheApp , FALSE ) ; - AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit , + AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) , (long) wxTheApp , FALSE ) ; #else AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments , NewAEEventHandlerProc(AEHandleODoc) , diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp index 9f495d36ef..df3790521a 100644 --- a/src/mac/carbon/control.cpp +++ b/src/mac/carbon/control.cpp @@ -70,7 +70,7 @@ wxControl::wxControl() if ( wxMacLiveScrollbarActionUPP == NULL ) { -#ifdef __UNIX__ +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); #else wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ; diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index a958d21f1f..107906e763 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -72,7 +72,7 @@ bool wxTimer::Start(int milliseconds,bool mode) wxCHECK_MSG( m_info.m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") ); m_milli = milliseconds; -#ifdef __UNIX__ +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) m_info.m_task.tmAddr = NewTimerUPP( MacTimerProc ) ; #else m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ; diff --git a/src/mac/control.cpp b/src/mac/control.cpp index 9f495d36ef..df3790521a 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -70,7 +70,7 @@ wxControl::wxControl() if ( wxMacLiveScrollbarActionUPP == NULL ) { -#ifdef __UNIX__ +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); #else wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ; diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp index a958d21f1f..107906e763 100644 --- a/src/mac/timer.cpp +++ b/src/mac/timer.cpp @@ -72,7 +72,7 @@ bool wxTimer::Start(int milliseconds,bool mode) wxCHECK_MSG( m_info.m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") ); m_milli = milliseconds; -#ifdef __UNIX__ +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) m_info.m_task.tmAddr = NewTimerUPP( MacTimerProc ) ; #else m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ; -- 2.47.2