From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 17 Dec 2002 17:25:33 +0000 (+0000)
Subject: Committed Stefan's temporary fix for crashing in Mac Classic.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/111c1e2c200bf4f8e20073cbd9e263a077eace19?hp=fbb2b01c2cef520bd91af451d8d18e4219b0a0c6

Committed Stefan's temporary fix for crashing in Mac Classic.


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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index e2be8c3b92..92e8cd3cc8 100644
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -400,6 +400,10 @@ void wxControl::MacPostControlCreate()
 	{
 	    wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefintion ) ;
 	}
+    // The following block of code is responsible for crashes when switching
+    // back to windows, which can be seen in the dialogs sample.
+    // It is disabled until a proper solution can be found.
+#if 0
 #if TARGET_CARBON
 /*
     only working under classic carbon
@@ -417,6 +421,7 @@ void wxControl::MacPostControlCreate()
       (**cdef).function = (void(*)()) wxMacControlActionUPP;
       (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
     }
+#endif
 #endif
 	SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;
  
diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index e2be8c3b92..92e8cd3cc8 100644
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -400,6 +400,10 @@ void wxControl::MacPostControlCreate()
 	{
 	    wxMacControlActionUPP = NewControlDefUPP( wxMacControlDefintion ) ;
 	}
+    // The following block of code is responsible for crashes when switching
+    // back to windows, which can be seen in the dialogs sample.
+    // It is disabled until a proper solution can be found.
+#if 0
 #if TARGET_CARBON
 /*
     only working under classic carbon
@@ -417,6 +421,7 @@ void wxControl::MacPostControlCreate()
       (**cdef).function = (void(*)()) wxMacControlActionUPP;
       (**(ControlHandle)m_macControl).contrlDefProc = (Handle) cdef ;
     }
+#endif
 #endif
 	SetControlColorProc( (ControlHandle) m_macControl , wxMacSetupControlBackgroundUPP ) ;