adding an autorelease capability (got weird crashes when deleting tools from a toolba...

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 154369334d552aa03a7661534254c59dcbbfaae1..8c52e9f221d625a17794475f4ecd4d42b9a3760c 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -32,21 +32,22 @@
     #include "wx/textctrl.h"
     #include "wx/memory.h"
     #include "wx/gdicmn.h"
     #include "wx/textctrl.h"
     #include "wx/memory.h"
     #include "wx/gdicmn.h"

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/tooltip.h"
 #include "wx/docview.h"
 #include "wx/filename.h"

+#include "wx/link.h"

 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__
 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__

-  #if __option(profile)
-    #include <profiler.h>
-  #endif
+    #if __option(profile)
+        #include <profiler.h>
+    #endif

 #endif
 
 // #include "apprsrc.h"
 #endif
 
 // #include "apprsrc.h"


@@ -67,9 +68,8 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-#if wxUSE_THREADS
-extern size_t g_numberOfThreads;
-#endif
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)

 
 // statics for implementation
 static bool s_inYield = false;
 
 // statics for implementation
 static bool s_inYield = false;


@@ -86,17 +86,11 @@ END_EVENT_TABLE()
 
 
 // platform specific static variables
 
 
 // platform specific static variables

-const short kMacMinHeap = (29 * 1024) ;
-const short kwxMacMenuBarResource = 1 ;
-const short kwxMacAppleMenuId = 1 ;
+static const short kwxMacAppleMenuId = 1 ;

 
 

-WXHRGN    wxApp::s_macCursorRgn = NULL;

 wxWindow* wxApp::s_captureWindow = NULL ;
 wxWindow* wxApp::s_captureWindow = NULL ;

-int       wxApp::s_lastMouseDown = 0 ;
-long      wxApp::sm_lastMessageTime = 0;

 long      wxApp::s_lastModifiers = 0 ;
 
 long      wxApp::s_lastModifiers = 0 ;
 

-bool      wxApp::s_macSupportPCMenuShortcuts = true ;

 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;
 long      wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 long      wxApp::s_macPreferencesMenuItemId = wxID_PREFERENCES ;
 long      wxApp::s_macExitMenuItemId = wxID_EXIT ;


@@ -108,33 +102,33 @@ bool      wxApp::sm_isEmbedded = false; // Normally we're not a plugin
 // Core Apple Event Support
 //----------------------------------------------------------------------
 
 // Core Apple Event Support
 //----------------------------------------------------------------------
 

-pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
-pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long refcon ) ;
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon refcon ) ;

 
 

-pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleODoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 
 {
     return wxTheApp->MacHandleAEODoc( (AppleEvent*) event , reply) ;
 }
 

-pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleOApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 
 {
     return wxTheApp->MacHandleAEOApp( (AppleEvent*) event , reply ) ;
 }
 

-pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandlePDoc( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 
 {
     return wxTheApp->MacHandleAEPDoc( (AppleEvent*) event , reply ) ;
 }
 

-pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 
 {
     return wxTheApp->MacHandleAEQuit( (AppleEvent*) event , reply) ;
 }
 

-pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 {
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }


@@ -474,7 +468,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
         }
         else
         {
         }
         else
         {

-            UInt32 refCon ;
+            URefCon refCon ;

 
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;
 
             GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
             itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;


@@ -810,8 +804,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
 #endif
 
 
 #endif
 

-    s_macCursorRgn = ::NewRgn() ;
-

     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the


@@ -858,6 +850,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     event_posted_context.perform = macPostedEventCallback;
     m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
     event_posted_context.perform = macPostedEventCallback;
     m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);

+       // run loop takes ownership
+       CFRelease(m_macEventPosted);

 #endif
 
     UMAShowArrowCursor() ;
 #endif
 
     UMAShowArrowCursor() ;


@@ -916,8 +910,10 @@ void wxApp::CleanUp()
 
 #ifdef __WXMAC_OSX__
     if (m_macEventPosted)
 
 #ifdef __WXMAC_OSX__
     if (m_macEventPosted)

-        CFRelease(m_macEventPosted);
-    m_macEventPosted = NULL;
+       {
+               CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+               m_macEventPosted = NULL;
+       }

 #endif
 
     // One last chance for pending objects to be cleaned up
 #endif
 
     // One last chance for pending objects to be cleaned up


@@ -933,8 +929,6 @@ void wxApp::CleanUp()
 #endif
 
     UMACleanupToolbox() ;
 #endif
 
     UMACleanupToolbox() ;

-    if (s_macCursorRgn)
-        ::DisposeRgn((RgnHandle)s_macCursorRgn);

 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );
 
     if (!sm_isEmbedded)
         RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );


@@ -1031,8 +1025,9 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
                     UInt32 keyCode ;
                     unsigned char charCode ;
                     UInt32 modifiers ;
                     UInt32 keyCode ;
                     unsigned char charCode ;
                     UInt32 modifiers ;

+#ifndef __LP64__

                     GetMouse( &rec->where) ;
                     GetMouse( &rec->where) ;

-
+#endif

                     err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                     err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
                     err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);
                     err = GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                     err = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
                     err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode);


@@ -1057,8 +1052,10 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
                             {
                                 UInt32 keyCode, modifiers;
                                 unsigned char charCode ;
                             {
                                 UInt32 keyCode, modifiers;
                                 unsigned char charCode ;

+#ifndef __LP64__

 
                                 GetMouse( &rec->where) ;
 
                                 GetMouse( &rec->where) ;

+#endif

                                 rec->what = keyDown ;
                                 err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                                 err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);
                                 rec->what = keyDown ;
                                 err = GetEventParameter(rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, 4, NULL, &modifiers);
                                 err = GetEventParameter(rawEvent, kEventParamKeyCode, typeUInt32, NULL, 4, NULL, &keyCode);


@@ -1234,6 +1231,14 @@ void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
     // Override to process unhandled events as you please
 }
 
     // Override to process unhandled events as you please
 }
 

+CFMutableArrayRef GetAutoReleaseArray()
+{
+    static CFMutableArrayRef array = 0;
+    if ( array == 0)
+        array= CFArrayCreateMutable(kCFAllocatorDefault,0,&kCFTypeArrayCallBacks);
+    return array;
+}
+

 void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 {
     EventTargetRef theTarget;
 void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 {
     EventTargetRef theTarget;


@@ -1249,6 +1254,13 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS

+
+    CFArrayRemoveAllValues( GetAutoReleaseArray() );
+}
+
+void wxApp::MacAddToAutorelease( void* cfrefobj )
+{
+    CFArrayAppendValue( GetAutoReleaseArray(), cfrefobj );

 }
 
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 }
 
 long wxMacTranslateKey(unsigned char key, unsigned char code)