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

diff --git a/src/mac/app.cpp b/src/mac/app.cpp
index 314d307ec8854dca1697dfc2d83d9f338d855af2..f54dbe1e63937e9662815c6103d38d654deedf48 100644 (file)
--- a/src/mac/app.cpp
+++ b/src/mac/app.cpp
@@ -353,14 +353,14 @@ bool wxApp::Initialize()
   SetEventMask( everyEvent ) ;
        UMAShowWatchCursor() ;
 
   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 ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp ,
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) ,

                            (long) wxTheApp , FALSE ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  AEHandlePDoc ,
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerUPP(AEHandlePDoc) ,

                            (long) wxTheApp , FALSE ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit ,
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) ,

                            (long) wxTheApp , FALSE ) ;
 #else
        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,
                            (long) wxTheApp , FALSE ) ;
 #else
        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 314d307ec8854dca1697dfc2d83d9f338d855af2..f54dbe1e63937e9662815c6103d38d654deedf48 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -353,14 +353,14 @@ bool wxApp::Initialize()
   SetEventMask( everyEvent ) ;
        UMAShowWatchCursor() ;
 
   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 ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , AEHandleOApp ,
+    AEInstallEventHandler( kCoreEventClass , kAEOpenApplication , NewAEEventHandlerUPP(AEHandleOApp) ,

                            (long) wxTheApp , FALSE ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  AEHandlePDoc ,
+    AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,  NewAEEventHandlerUPP(AEHandlePDoc) ,

                            (long) wxTheApp , FALSE ) ;
                            (long) wxTheApp , FALSE ) ;

-    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , AEHandleQuit ,
+    AEInstallEventHandler( kCoreEventClass , kAEQuitApplication , NewAEEventHandlerUPP(AEHandleQuit) ,

                            (long) wxTheApp , FALSE ) ;
 #else
        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,
                            (long) wxTheApp , FALSE ) ;
 #else
        AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,   NewAEEventHandlerProc(AEHandleODoc) ,

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 9f495d36efbd710171eb35f448c5edb7add4c4f2..df3790521ac6fdc21f547c9c520369da1dbe313d 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -70,7 +70,7 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {

-#ifdef __UNIX__
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index a958d21f1ff37849bad8cc01d9670073d372a8fc..107906e76390397021ded29b072e42561e845348 100644 (file)
--- 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;
     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 ) ;
     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 9f495d36efbd710171eb35f448c5edb7add4c4f2..df3790521ac6fdc21f547c9c520369da1dbe313d 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -70,7 +70,7 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {

-#ifdef __UNIX__
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
         wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
 #else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;

diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp
index a958d21f1ff37849bad8cc01d9670073d372a8fc..107906e76390397021ded29b072e42561e845348 100644 (file)
--- 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;
     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 ) ;
     m_info.m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
 #else
     m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ;