X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a67a93b17c37c018f60e662645ee2a44ba4e58e..ba0b7b323817e44903ba5ee199d17bbb166ed3d5:/src/mac/carbon/app.cpp?ds=sidebyside

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 314d307ec8..095156baa1 100644
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -31,6 +31,7 @@
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/tooltip.h"
+#include "wx/textctrl.h"
 #include "wx/menu.h"
 #if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
@@ -40,7 +41,7 @@
 
 // mac
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
 	#include <profiler.h>
   #endif
@@ -52,7 +53,7 @@
 #include "wx/mac/macnotfy.h"
 
 #if wxUSE_SOCKETS
-    #ifdef __APPLE__
+    #ifdef __DARWIN__
         #include <CoreServices/CoreServices.h>
     #else
         #include <OpenTransport.h>
@@ -88,8 +89,6 @@ wxWindow*			wxApp::s_captureWindow = NULL ;
 int					wxApp::s_lastMouseDown = 0 ;
 long 					wxApp::sm_lastMessageTime = 0;
 
-#ifdef __WXMAC__
-
 bool	wxApp::s_macDefaultEncodingIsPC = true ;
 bool wxApp::s_macSupportPCMenuShortcuts = true ;
 long wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
@@ -137,6 +136,7 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , unsigne
 
 OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply)
 {
+    SysBeep(40) ;
 	ProcessSerialNumber PSN ;
 	PSN.highLongOfPSN = 0 ;
 	PSN.lowLongOfPSN = kCurrentProcess ;
@@ -341,7 +341,44 @@ wxString wxMacMakePCStringFromMac( const char * p )
 	return result ;
 }
 
-#endif
+wxString wxMacMakeStringFromMacString( const char* from , bool mac2pcEncoding ) 
+{
+	if (mac2pcEncoding)
+	{
+	  return wxMacMakePCStringFromMac( from ) ;
+	}
+	else
+	{
+	  return wxString( from ) ;
+	}
+}
+
+wxString wxMacMakeStringFromPascal( StringPtr from , bool mac2pcEncoding ) 
+{
+  // this is safe since a pascal string can never be larger than 256 bytes
+  char s[256] ;
+  CopyPascalStringToC( from , s ) ;
+	if (mac2pcEncoding)
+	{
+	  return wxMacMakePCStringFromMac( s ) ;
+	}
+	else
+	{
+	  return wxString( s ) ;
+	}
+}
+
+void wxMacStringToPascal( const char * from , StringPtr to , bool pc2macEncoding ) 
+{
+	if (pc2macEncoding)
+	{
+	  CopyCStringToPascal( wxMacMakeMacStringFromPC( from ) , to ) ;
+	}
+	else
+	{
+	  CopyCStringToPascal( from , to ) ;
+	}
+}
 
 bool wxApp::Initialize()
 {
@@ -353,14 +390,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) ,
@@ -374,7 +411,7 @@ bool wxApp::Initialize()
 #endif
 
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   // test the minimal configuration necessary
 
 	#if !TARGET_CARBON
@@ -427,7 +464,7 @@ bool wxApp::Initialize()
 	  return FALSE ;
   }
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
 	ProfilerInit( collectDetailed, bestTimeBase , 20000 , 40 ) ;
   #endif
@@ -435,7 +472,7 @@ bool wxApp::Initialize()
 
   // now avoid exceptions thrown for new (bad_alloc)
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   std::__throws_bad_alloc = FALSE ;
 #endif
 
@@ -459,6 +496,7 @@ bool wxApp::Initialize()
   wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
   wxTheColourDatabase->Initialize();
 
+#ifdef __WXDEBUG__
 #if wxUSE_LOG
     // flush the logged messages if any and install a 'safer' log target: the
     // default one (wxLogGui) can't be used after the resources are freed just
@@ -469,6 +507,7 @@ bool wxApp::Initialize()
     // this will flush the old messages if any
     delete wxLog::SetActiveTarget(new wxLogStderr);
 #endif // wxUSE_LOG
+#endif
 
   wxInitializeStockLists();
   wxInitializeStockObjects();
@@ -542,7 +581,7 @@ void wxApp::CleanUp()
 
   wxClassInfo::CleanUpClasses();
 
-#ifndef __UNIX__
+#ifndef __DARWIN__
   #if __option(profile)
   ProfilerDump( "\papp.prof" ) ;
   ProfilerTerm() ;
@@ -900,11 +939,13 @@ bool wxYield()
 #endif
     EventRecord event ;
 
-	long sleepTime = 0 ; //::GetCaretTime();
+	long sleepTime = 1 ; //::GetCaretTime();
 
 	while ( !wxTheApp->IsExiting() && WaitNextEvent(everyEvent, &event,sleepTime, wxApp::s_macCursorRgn))
 	{
     	wxTheApp->MacHandleOneEvent( &event );
+	    if ( event.what != kHighLevelEvent )
+		    SetRectRgn( wxApp::s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
 	}
 
 	wxMacProcessNotifierAndPendingEvents() ;
@@ -981,7 +1022,7 @@ void wxApp::MacDoOneEvent()
 		wxTheApp->ProcessIdle() ;
 	}
 	if ( event.what != kHighLevelEvent )
-		SetRectRgn( s_macCursorRgn , event.where.h - 1 , event.where.v - 1,  event.where.h + 1 , event.where.v + 1 ) ;
+		SetRectRgn( s_macCursorRgn , event.where.h , event.where.v ,  event.where.h + 1 , event.where.v + 1 ) ;
 
 	// repeaters
 
@@ -1194,6 +1235,8 @@ void wxApp::MacHandleMouseDownEvent( EventRecord *ev )
 					}
 					else
 					{
+						if ( win )
+							win->MacMouseDown( ev , windowPart ) ;
 						UMASelectWindow( window ) ;
 					}
 				}