From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 1 May 2004 06:34:28 +0000 (+0000)
Subject: replacing OSX only carbon calls by classic ones for CFM build
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1d3216f76d60e8382cac4503b12a02599b4323dc

replacing OSX only carbon calls by classic ones for CFM build


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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 88c4356480..773b9a2391 100644
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1652,10 +1652,17 @@ bool wxWindowMac::Enable(bool enable)
         return FALSE;
 
     bool former = MacIsReallyEnabled() ;
+#if TARGET_API_MAC_OSX
     if ( enable )
         EnableControl( (ControlRef) m_macControl ) ;
     else
         DisableControl( (ControlRef) m_macControl ) ;
+#else
+    if ( enable )
+        ActivateControl( (ControlRef) m_macControl ) ;
+    else
+        DeactivateControl( (ControlRef) m_macControl ) ;
+#endif
 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;
@@ -1757,7 +1764,11 @@ bool wxWindowMac::MacIsReallyShown()
 
 bool wxWindowMac::MacIsReallyEnabled() 
 {
+#if TARGET_API_MAC_OSX
     return IsControlEnabled( (ControlRef) m_macControl ) ;
+#else
+    return IsControlActive( (ControlRef) m_macControl ) ;
+#endif
 }
 
 bool wxWindowMac::MacIsReallyHilited()