Unwanted semicolon fix [#1212497] + source cleaning.

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index bcf9cfb1d1ece1f0c91b19629338647cd92a6c9b..356c2b2ecc511dc36119169c7734aecb9964fb36 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "app.h"
 #endif
 
 #pragma implementation "app.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #include "wx/window.h"
 #include "wx/frame.h"
 
 #include "wx/window.h"
 #include "wx/frame.h"


@@ -49,7 +49,7 @@
   #endif
 #endif
 
   #endif
 #endif
 

-#include "apprsrc.h"
+// #include "apprsrc.h"

 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/macnotfy.h"


@@ -69,6 +69,16 @@
 
 extern wxList wxPendingDelete;
 
 
 extern wxList wxPendingDelete;
 

+// set wxMAC_USE_RAEL to 1 if RunApplicationEventLoop should be used
+// if 0 the lower level CarbonEventLoop will be used
+// on the long run RAEL should replace the low level event loop
+// we will have to clean up event handling to make sure we don't 
+// miss handling of things like pending events etc
+// perhaps we will also have to pipe events through an ueber-event-handler
+// to make sure we have one place to do all these house-keeping functions
+
+#define wxMAC_USE_RAEL 0
+

 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 #endif // wxUSE_THREADS


@@ -80,14 +90,12 @@ static bool s_inYield = FALSE;
 static bool s_inReceiveEvent = FALSE ;
 static EventTime sleepTime = kEventDurationNoWait ;
 
 static bool s_inReceiveEvent = FALSE ;
 static EventTime sleepTime = kEventDurationNoWait ;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     EVT_IDLE(wxApp::OnIdle)
     EVT_END_SESSION(wxApp::OnEndSession)
     EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
 END_EVENT_TABLE()

-#endif

 
 
 const short    kMacMinHeap = (29 * 1024) ;
 
 
 const short    kMacMinHeap = (29 * 1024) ;


@@ -155,7 +163,6 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     DescType returnedType;
     Size actualSize;
     long itemsInList;
     DescType returnedType;
     Size actualSize;
     long itemsInList;

-    FSSpec theSpec;

     OSErr err;
     short i;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     OSErr err;
     short i;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);


@@ -171,10 +178,15 @@ short wxApp::MacHandleAEODoc(const WXEVENTREF event, WXEVENTREF WXUNUSED(reply))
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 
     PSN.lowLongOfPSN = kCurrentProcess ;
     SetFrontProcess( &PSN ) ;
 

-    for (i = 1; i <= itemsInList; i++) {
-        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
-        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
-        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+    for (i = 1; i <= itemsInList; i++) 
+    {
+        wxString fName ;
+
+        FSRef theRef ;
+        AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType,
+        (Ptr) & theRef, sizeof(theRef), &actualSize);
+        fName = wxMacFSRefToPath( &theRef ) ;
+

         MacOpenFile(fName);
     }
     return noErr;
         MacOpenFile(fName);
     }
     return noErr;


@@ -189,7 +201,6 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
     DescType returnedType;
     Size actualSize;
     long itemsInList;
     DescType returnedType;
     Size actualSize;
     long itemsInList;

-    FSSpec theSpec;

     OSErr err;
     short i;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);
     OSErr err;
     short i;
     err = AEGetParamDesc((AppleEvent *)event, keyDirectObject, typeAEList,&docList);


@@ -206,9 +217,13 @@ short wxApp::MacHandleAEPDoc(const WXEVENTREF event , WXEVENTREF WXUNUSED(reply)
     SetFrontProcess( &PSN ) ;
 
     for (i = 1; i <= itemsInList; i++) {
     SetFrontProcess( &PSN ) ;
 
     for (i = 1; i <= itemsInList; i++) {

-        AEGetNthPtr(&docList, i, typeFSS, &keywd, &returnedType,
-        (Ptr) & theSpec, sizeof(theSpec), &actualSize);
-        wxString fName = wxMacFSSpec2MacFilename(&theSpec);
+        wxString fName ;
+
+        FSRef theRef ;
+        AEGetNthPtr(&docList, i, typeFSRef, &keywd, &returnedType,
+        (Ptr) & theRef, sizeof(theRef), &actualSize);
+        fName = wxMacFSRefToPath( &theRef ) ;
+

         MacPrintFile(fName);
     }
     return noErr;
         MacPrintFile(fName);
     }
     return noErr;


@@ -249,19 +264,26 @@ short wxApp::MacHandleAERApp(const WXEVENTREF WXUNUSED(event) , WXEVENTREF WXUNU
 }
 
 
 }
 
 

+

 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {
 //----------------------------------------------------------------------
 // Support Routines linking the Mac...File Calls to the Document Manager
 //----------------------------------------------------------------------
 
 void wxApp::MacOpenFile(const wxString & fileName )
 {

+#if wxUSE_DOC_VIEW_ARCHITECTURE

     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
         dm->CreateDocument(fileName , wxDOC_SILENT ) ;
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
         dm->CreateDocument(fileName , wxDOC_SILENT ) ;

+#endif

 }
 
 }
 

+

 void wxApp::MacPrintFile(const wxString & fileName )
 {
 void wxApp::MacPrintFile(const wxString & fileName )
 {

+#if wxUSE_DOC_VIEW_ARCHITECTURE
+
+#if wxUSE_PRINTING_ARCHITECTURE

     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
     {
     wxDocManager* dm = wxDocManager::GetDocumentManager() ;
     if ( dm )
     {


@@ -286,15 +308,50 @@ void wxApp::MacPrintFile(const wxString & fileName )
             }
         }
     }
             }
         }
     }

+#endif //print
+
+#endif //docview

 }
 
 }
 

+
+

 void wxApp::MacNewFile()
 {
 }
 
 void wxApp::MacReopenApp()
 {
 void wxApp::MacNewFile()
 {
 }
 
 void wxApp::MacReopenApp()
 {

-    // eventually check for open docs, if none, call MacNewFile
+    // HIG says :
+    // if there is no open window -> create a new one
+    // if all windows are hidden -> show the first
+    // if some windows are not hidden -> do nothing
+    
+    wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+    if ( node == NULL )
+    {  
+        MacNewFile() ;
+    }
+    else
+    {
+        wxTopLevelWindow* firstIconized = NULL ;
+        while (node)
+        {
+            wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
+            if ( win->IsIconized() == false )
+            {
+                firstIconized = NULL ;
+                break ;
+            }
+            else
+            {
+                if ( firstIconized == NULL )
+                    firstIconized = win ;
+            }
+            node = node->GetNext();
+        }
+        if ( firstIconized )
+            firstIconized->Iconize( false ) ;
+    }

 }
 
 //----------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------


@@ -326,57 +383,52 @@ static const EventTypeSpec eventList[] =
 
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 
 static pascal OSStatus
 wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )

-{
-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar();
+{    
+    wxMacCarbonEvent cEvent( event ) ;
+    MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
+    wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;

     
     

-    if ( mbar )
+    if ( menu )

     {
     {

-        wxFrame* win = mbar->GetFrame();
-        if ( win )
+        wxEventType type=0;        
+        MenuCommand cmd=0;
+        switch (GetEventKind(event))

         {
         {

-            
-            // VZ: we could find the menu from its handle here by examining all
-            //     the menus in the menu bar recursively but knowing that neither
-            //     wxMSW nor wxGTK do it why bother...
- #if 0
-            MenuRef menuRef;
-
-            GetEventParameter(event,
-                              kEventParamDirectObject,
-                              typeMenuRef, NULL,
-                              sizeof(menuRef), NULL,
-                              &menuRef);
- #endif // 0
-
-            wxEventType type=0;        
-            MenuCommand cmd=0;
-            switch (GetEventKind(event))
-            {
-                case kEventMenuOpening:
-                    type = wxEVT_MENU_OPEN;
-                    break;
-                case kEventMenuClosed:
-                    type = wxEVT_MENU_CLOSE;
-                    break;
-                case kEventMenuTargetItem:
+            case kEventMenuOpening:
+                type = wxEVT_MENU_OPEN;
+                break;
+            case kEventMenuClosed:
+                type = wxEVT_MENU_CLOSE;
+                break;
+            case kEventMenuTargetItem:
+                cmd = cEvent.GetParameter<MenuCommand>(kEventParamMenuCommand,typeMenuCommand) ;
+                if (cmd != 0) 

                     type = wxEVT_MENU_HIGHLIGHT;
                     type = wxEVT_MENU_HIGHLIGHT;

-                    GetEventParameter(event, kEventParamMenuCommand,
-                                      typeMenuCommand, NULL,
-                                      sizeof(cmd), NULL, &cmd);
-                    if (cmd == 0) return eventNotHandledErr;
-                    break;
-                default:
-                    wxFAIL_MSG(wxT("Unexpected menu event kind"));
-                    break;
-            }
+                break;
+            default:
+                wxFAIL_MSG(wxT("Unexpected menu event kind"));
+                break;
+        }

 
 

-            wxMenuEvent wxevent(type, cmd);
-            wxevent.SetEventObject(win);
+        if ( type )
+        {
+            wxMenuEvent wxevent(type, cmd, menu);
+            wxevent.SetEventObject(menu);

 
 

-            (void)win->GetEventHandler()->ProcessEvent(wxevent);
-        }
+            wxEvtHandler* handler = menu->GetEventHandler();
+            if (handler && handler->ProcessEvent(wxevent))
+            {
+                // handled
+            }
+            else
+            {
+                wxWindow *win = menu->GetInvokingWindow();
+                if (win) 
+                    win->GetEventHandler()->ProcessEvent(wxevent);
+                }
+            }

     }
     }

-
+    

     return eventNotHandledErr;
 }
 
     return eventNotHandledErr;
 }
 


@@ -386,32 +438,31 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
 
     HICommand command ;
 
 
     HICommand command ;
 

-    GetEventParameter( event, kEventParamDirectObject, typeHICommand, NULL,
-        sizeof( HICommand ), NULL, &command );
-
+    wxMacCarbonEvent cEvent( event ) ;
+    cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
+        
+    wxMenuItem* item = NULL ;

     MenuCommand id = command.commandID ;
     MenuCommand id = command.commandID ;

+    // for items we don't really control

     if ( id == kHICommandPreferences )
     if ( id == kHICommandPreferences )

-        id = wxApp::s_macPreferencesMenuItemId ;
-
-    wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
-    wxMenu* menu = NULL ;
-    wxMenuItem* item = NULL ;
-
-    if ( mbar )

     {
     {

-        item = mbar->FindItem( id , &menu ) ;
-        // it is not 100 % sure that an menu of id 0 is really ours, safety check
-        if ( id == 0 && menu != NULL && menu->GetHMenu() != command.menu.menuRef )
+        id = wxApp::s_macPreferencesMenuItemId ;
+        
+        wxMenuBar* mbar = wxMenuBar::MacGetInstalledMenuBar() ;
+        if ( mbar )

         {
         {

-            item = NULL ;
-            menu = NULL ;
+            wxMenu* menu = NULL ;
+            item = mbar->FindItem( id , &menu ) ;

         }
     }
         }
     }

-
-    if ( item == NULL || menu == NULL || mbar == NULL )
-        return result ;
-
-       switch( GetEventKind( event ) )
+    else if ( id != 0 && command.menu.menuRef != 0 && command.menu.menuItemIndex != 0 )
+    {
+        GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , (UInt32*) &item ) ;
+    }
+    
+    if ( item )
+    {
+       switch( cEvent.GetKind() )

        {
            case kEventProcessCommand :
            {
        {
            case kEventProcessCommand :
            {


@@ -420,18 +471,18 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                     item->Check( !item->IsChecked() ) ;
                 }
 
                     item->Check( !item->IsChecked() ) ;
                 }
 

-                menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
+                item->GetMenu()->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;

                 result = noErr ;
             }
                 result = noErr ;
             }

-               break ;
+            break ;

         case kEventCommandUpdateStatus:
             // eventually trigger an updateui round
             result = noErr ;
             break ;
         case kEventCommandUpdateStatus:
             // eventually trigger an updateui round
             result = noErr ;
             break ;

-           default :
-               break ;
-       }
-
+        default :
+            break ;
+        }
+    }

     return result ;
 }
 
     return result ;
 }
 


@@ -462,6 +513,10 @@ static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef hand
 
 pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
 
 pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {

+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;
+

     OSStatus result = eventNotHandledErr ;
     switch( GetEventClass( event ) )
     {
     OSStatus result = eventNotHandledErr ;
     switch( GetEventClass( event ) )
     {


@@ -475,7 +530,17 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;
         case kEventClassMouse :
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;
         case kEventClassMouse :

-            result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
+            {
+                wxMacCarbonEvent cEvent( event ) ;
+                
+                WindowRef window ;
+                Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
+                ::FindWindow(screenMouseLocation, &window);
+                // only send this event in case it had not already been sent to a tlw, as we get
+                // double events otherwise (in case event.skip) was called
+                if ( window == NULL )
+                    result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
+            }

             break ;
         case kEventClassAppleEvent :
             {
             break ;
         case kEventClassAppleEvent :
             {


@@ -488,6 +553,8 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
             break ;
     }
 
             break ;
     }
 

+    wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+

     return result ;
 }
 
     return result ;
 }
 


@@ -498,6 +565,8 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 
 WXIMPORT char std::__throws_bad_alloc ;
 #endif
 

+#if __WXDEBUG__
+

 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, 
     const char *assertionString, const char *exceptionLabelString, 
     const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options, 
     const char *assertionString, const char *exceptionLabelString, 
     const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)


@@ -534,6 +603,18 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 #endif
 }
 
 #endif
 }
 

+#endif //__WXDEBUG__
+
+#ifdef __WXMAC_OSX__
+extern "C" {
+   /* m_macEventPosted run loop source callback: */
+   void macPostedEventCallback(void *unused);
+}
+
+void macPostedEventCallback(void *unused) {
+    wxTheApp->ProcessPendingEvents(); }
+#endif
+

 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     // Mac-specific


@@ -545,12 +626,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     SetEventMask( everyEvent ) ;
     UMAShowWatchCursor() ;
 
     SetEventMask( everyEvent ) ;
     UMAShowWatchCursor() ;
 

-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-    // open shared library resources from here since we don't have
-    //   __wxinitialize in Mach-O shared libraries
-    wxStAppResource::OpenSharedLibraryResource(NULL);
-#endif
-

 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
 #ifndef __DARWIN__
 #  if __option(profile)
     ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;


@@ -590,14 +665,43 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 
     wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
 #endif
 

+#if TARGET_API_MAC_OSX
+    // these might be the startup dirs, set them to the 'usual' dir containing the app bundle
+    wxString startupCwd = wxGetCwd() ;
+    if ( startupCwd == wxT("/") || startupCwd.Right(15) == wxT("/Contents/MacOS") )
+    {
+        CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ;
+        CFURLRef urlParent = CFURLCreateCopyDeletingLastPathComponent( kCFAllocatorDefault , url ) ;
+        CFRelease( url ) ;
+        CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
+        CFRelease( urlParent ) ;
+        wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());       
+        wxSetWorkingDirectory( cwd ) ;
+    }
+#endif

 
     wxMacCreateNotifierTable() ;
 
 
     wxMacCreateNotifierTable() ;
 

+#ifdef __WXMAC_OSX__
+    /* connect posted events to common-mode run loop so that wxPostEvent events
+       are handled even while we're in the menu or on a scrollbar */
+    CFRunLoopSourceContext event_posted_context = {0};
+    event_posted_context.perform = macPostedEventCallback;
+    m_macEventPosted = CFRunLoopSourceCreate(NULL,0,&event_posted_context);
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
+#endif
+

     UMAShowArrowCursor() ;
 
     return true;
 }
 
     UMAShowArrowCursor() ;
 
     return true;
 }
 

+AEEventHandlerUPP sODocHandler = NULL ;
+AEEventHandlerUPP sOAppHandler = NULL ;
+AEEventHandlerUPP sPDocHandler = NULL ;
+AEEventHandlerUPP sRAppHandler = NULL ;
+AEEventHandlerUPP sQuitHandler = NULL ;
+

 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )
 bool wxApp::OnInitGui()
 {
     if( !wxAppBase::OnInitGui() )


@@ -614,21 +718,22 @@ bool wxApp::OnInitGui()
 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {

+        sODocHandler = NewAEEventHandlerUPP(AEHandleODoc) ;
+        sOAppHandler = NewAEEventHandlerUPP(AEHandleOApp) ;
+        sPDocHandler = NewAEEventHandlerUPP(AEHandlePDoc) ;
+        sRAppHandler = NewAEEventHandlerUPP(AEHandleRApp) ;
+        sQuitHandler = NewAEEventHandlerUPP(AEHandleQuit) ;
+

         AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,
         AEInstallEventHandler( kCoreEventClass , kAEOpenDocuments ,

-                               NewAEEventHandlerUPP(AEHandleODoc) ,
-                               0 , FALSE ) ;
+                               sODocHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEOpenApplication ,

-                               NewAEEventHandlerUPP(AEHandleOApp) ,
-                               0 , FALSE ) ;
+                               sOAppHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,
         AEInstallEventHandler( kCoreEventClass , kAEPrintDocuments ,

-                               NewAEEventHandlerUPP(AEHandlePDoc) ,
-                               0 , FALSE ) ;
+                               sPDocHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEReopenApplication ,

-                               NewAEEventHandlerUPP(AEHandleRApp) ,
-                               0 , FALSE ) ;
+                               sRAppHandler , 0 , FALSE ) ;

         AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,
         AEInstallEventHandler( kCoreEventClass , kAEQuitApplication ,

-                               NewAEEventHandlerUPP(AEHandleQuit) ,
-                               0 , FALSE ) ;
+                               sQuitHandler , 0 , FALSE ) ;

     }
 
     return TRUE ;
     }
 
     return TRUE ;


@@ -636,7 +741,17 @@ bool wxApp::OnInitGui()
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

+#if wxUSE_TOOLTIPS

     wxToolTip::RemoveToolTips() ;
     wxToolTip::RemoveToolTips() ;

+#endif
+
+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRelease(m_macEventPosted);
+    }
+    m_macEventPosted = NULL;
+#endif

 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();
 
     // One last chance for pending objects to be cleaned up
     wxTheApp->DeletePendingObjects();


@@ -650,174 +765,42 @@ void wxApp::CleanUp()
 #  endif
 #endif
 
 #  endif
 #endif
 

-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-    // close shared library resources from here since we don't have
-    //   __wxterminate in Mach-O shared libraries
-    wxStAppResource::CloseSharedLibraryResource();
-#endif
-

     UMACleanupToolbox() ;
     if (s_macCursorRgn) {
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }
 
     UMACleanupToolbox() ;
     if (s_macCursorRgn) {
         ::DisposeRgn((RgnHandle)s_macCursorRgn);
     }
 

-    #if 0
-        TerminateAE() ;
-    #endif
-
-    wxAppBase::CleanUp();
-}
-
-//----------------------------------------------------------------------
-// misc initialization stuff
-//----------------------------------------------------------------------
-
-// extern variable for shared library resource id
-// need to be able to find it with NSLookupAndBindSymbol
-short gSharedLibraryResource = kResFileNotOpened ;
-
-#if defined(WXMAKINGDLL_CORE) && defined(__DARWIN__)
-CFBundleRef gSharedLibraryBundle = NULL;
-#endif /* WXMAKINGDLL_CORE && __DARWIN__ */
-
-wxStAppResource::wxStAppResource()
-{
-    m_currentRefNum = CurResFile() ;
-    if ( gSharedLibraryResource != kResFileNotOpened )
+    if (!sm_isEmbedded)

     {
     {

-        UseResFile( gSharedLibraryResource ) ;
+        RemoveEventHandler( (EventHandlerRef)(wxTheApp->m_macEventHandler) );

     }
     }

-}
-
-wxStAppResource::~wxStAppResource()
-{
-    if ( m_currentRefNum != kResFileNotOpened )
+       
+    if (!sm_isEmbedded)

     {
     {

-        UseResFile( m_currentRefNum ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEOpenDocuments ,
+                               sODocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEOpenApplication ,
+                               sOAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEPrintDocuments ,
+                               sPDocHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEReopenApplication ,
+                               sRAppHandler , FALSE ) ;
+        AERemoveEventHandler( kCoreEventClass , kAEQuitApplication ,
+                               sQuitHandler , FALSE ) ;
+                               
+        DisposeAEEventHandlerUPP( sODocHandler ) ;
+        DisposeAEEventHandlerUPP( sOAppHandler ) ;
+        DisposeAEEventHandlerUPP( sPDocHandler ) ;
+        DisposeAEEventHandlerUPP( sRAppHandler ) ;
+        DisposeAEEventHandlerUPP( sQuitHandler ) ;

     }
     }

-}
-
-void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
-{
-    gSharedLibraryResource = kResFileNotOpened;
-
-#ifdef WXMAKINGDLL_CORE
-    if ( initBlock != NULL ) {
-        const CFragInitBlock *theInitBlock = (const CFragInitBlock *)initBlock;
-        FSSpec *fileSpec = NULL;
-
-        if (theInitBlock->fragLocator.where == kDataForkCFragLocator) {
-            fileSpec = theInitBlock->fragLocator.u.onDisk.fileSpec;
-        }
-        else if (theInitBlock->fragLocator.where == kResourceCFragLocator) {
-            fileSpec = theInitBlock->fragLocator.u.inSegs.fileSpec;
-        }
-
-        if (fileSpec != NULL) {
-            gSharedLibraryResource =  FSpOpenResFile(fileSpec, fsRdPerm);
-        }
-    }
-    else {
-#ifdef __DARWIN__
-        // Open the shared library resource file if it is not yet open
-        NSSymbol    theSymbol;
-        NSModule    theModule;
-        const char *theLibPath;
-
-        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
-        if (gSharedLibraryBundle != NULL) {
-            // wxWindows has been bundled into a framework
-            //   load the framework resources
-
-            gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
-        }
-        else {
-            // wxWindows is a simple dynamic shared library
-            //   load the resources from the data fork of a separate resource file
-            wxString theResPath;
-            wxString theName;
-            FSRef  theResRef;
-            OSErr  theErr = noErr;
-
-            // get the library path
-            theSymbol = NSLookupAndBindSymbol("_gSharedLibraryResource");
-            theModule = NSModuleForSymbol(theSymbol);
-            theLibPath = NSLibraryNameForModule(theModule);
-
-            // if we call wxLogDebug from here then, as wxTheApp hasn't been
-            // created yet when we're called from wxApp::Initialize(), wxLog
-            // is going to create a default stderr-based log target instead of
-            // the expected normal GUI one -- don't do it, if we really want
-            // to see this message just use fprintf() here
-#if 0
-            wxLogDebug( wxT("wxMac library installation name is '%s'"),
-                        theLibPath );
-#endif

 
 

-            // allocate copy to replace .dylib.* extension with .rsrc
-            if (theLibPath != NULL) {
-#if wxUSE_UNICODE
-                theResPath = wxString(theLibPath, wxConvLocal);
-#else
-                theResPath = wxString(theLibPath);
-#endif
-                // replace '_core' with '' in case of multi-lib build
-                theResPath.Replace(wxT("_core"), wxEmptyString);
-                // replace ".dylib" shared library extension with ".rsrc"
-                theResPath.Replace(wxT(".dylib"), wxT(".rsrc"));
-                // Find the begining of the filename
-                theName = theResPath.AfterLast('/');
-
-#if 0
-                wxLogDebug( wxT("wxMac resources file name is '%s'"),
-                            theResPath.mb_str() );
-#endif
-
-                theErr = FSPathMakeRef((UInt8 *) theResPath.mb_str(), &theResRef, false);
-                if (theErr != noErr) {
-                    // try in current directory (using name only)
-                    theErr = FSPathMakeRef((UInt8 *) theName.mb_str(), &theResRef, false);
-                }
-
-                // open the resource file
-                if (theErr == noErr) {
-                    theErr = FSOpenResourceFile( &theResRef, 0, NULL, fsRdPerm,
-                                                 &gSharedLibraryResource);
-                }
-                if (theErr != noErr) {
-#ifdef __WXDEBUG__
-                    wxLogDebug( wxT("unable to open wxMac resource file '%s'\n"),
-                                theResPath.mb_str() );
-#endif // __WXDEBUG__
-                }
-
-            }
-        }
-#endif /* __DARWIN__ */
-    }
-#endif /* WXMAKINGDLL_CORE */
+    wxAppBase::CleanUp();

 }
 
 }
 

-void wxStAppResource::CloseSharedLibraryResource()
-{
-#ifdef WXMAKINGDLL_CORE
-    // Close the shared library resource file
-    if (gSharedLibraryResource != kResFileNotOpened) {
-#ifdef __DARWIN__
-        if (gSharedLibraryBundle != NULL) {
-            CFBundleCloseBundleResourceMap(gSharedLibraryBundle,
-                                           gSharedLibraryResource);
-            gSharedLibraryBundle = NULL;
-        }
-        else
-#endif /* __DARWIN__ */
-        {
-            CloseResFile(gSharedLibraryResource);
-        }
-        gSharedLibraryResource = kResFileNotOpened;
-    }
-#endif /* WXMAKINGDLL_CORE */
-}
+//----------------------------------------------------------------------
+// misc initialization stuff
+//----------------------------------------------------------------------

 
 #if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
 
 
 #if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
 


@@ -833,13 +816,11 @@ extern "C" {
 
 pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
 {
 
 pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
 {

-    wxStAppResource::OpenSharedLibraryResource( theInitBlock ) ;

     return __initialize( theInitBlock ) ;
 }
 
 pascal void __wxterminate(void)
 {
     return __initialize( theInitBlock ) ;
 }
 
 pascal void __wxterminate(void)
 {

-    wxStAppResource::CloseSharedLibraryResource() ;

     __terminate() ;
 }
 
     __terminate() ;
 }
 


@@ -925,27 +906,35 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-  m_printMode = wxPRINT_WINDOWS;
+    m_printMode = wxPRINT_WINDOWS;

 
 

-  m_macCurrentEvent = NULL ;
-  m_macCurrentEventHandlerCallRef = NULL ;
+    m_macCurrentEvent = NULL ;
+    m_macCurrentEventHandlerCallRef = NULL ;
+#ifdef __WXMAC_OSX__
+    m_macEventPosted = NULL ;
+#endif

 }
 
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;
 }
 
 int wxApp::MainLoop()
 {
     m_keepGoing = TRUE;

-
+#if wxMAC_USE_RAEL
+    RunApplicationEventLoop() ;
+#else

     while (m_keepGoing)
     {
         MacDoOneEvent() ;
     }
     while (m_keepGoing)
     {
         MacDoOneEvent() ;
     }

-
+#endif

     return 0;
 }
 
 void wxApp::ExitMainLoop()
 {
     return 0;
 }
 
 void wxApp::ExitMainLoop()
 {

-      m_keepGoing = FALSE;
+    m_keepGoing = FALSE;
+#if wxMAC_USE_RAEL
+    QuitApplicationEventLoop() ;
+#endif

 }
 
 // Is a message/event pending?
 }
 
 // Is a message/event pending?


@@ -980,6 +969,12 @@ void wxApp::OnIdle(wxIdleEvent& event)
 
 void wxApp::WakeUpIdle()
 {
 
 void wxApp::WakeUpIdle()
 {

+#ifdef __WXMAC_OSX__
+    if (m_macEventPosted)
+    {
+        CFRunLoopSourceSignal(m_macEventPosted);
+    }
+#endif

     wxMacWakeUp() ;
 }
 
     wxMacWakeUp() ;
 }
 


@@ -1028,9 +1023,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     s_inYield = TRUE;
 
 
     s_inYield = TRUE;
 

-#if wxUSE_THREADS
-    YieldToAnyThread() ;
-#endif

     // by definition yield should handle all non-processed events
 
     EventRef theEvent;
     // by definition yield should handle all non-processed events
 
     EventRef theEvent;


@@ -1077,19 +1069,7 @@ void wxApp::MacDoOneEvent()
         if ( wxTheApp->ProcessIdle() )
             sleepTime = kEventDurationNoWait ;
         else
         if ( wxTheApp->ProcessIdle() )
             sleepTime = kEventDurationNoWait ;
         else

-        {
-#if wxUSE_THREADS
-            if (g_numberOfThreads)
-            {
-                YieldToAnyThread() ;
-                sleepTime = kEventDurationNoWait;
-            }
-            else
-#endif // wxUSE_THREADS
-            {
-                sleepTime = kEventDurationSecond;
-            }
-        }
+            sleepTime = kEventDurationSecond;

     }
     else if ( status == eventLoopQuitErr )
     {
     }
     else if ( status == eventLoopQuitErr )
     {


@@ -1263,13 +1243,12 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
     }
 }
 
     }
 }
 

+#ifndef __DARWIN__

 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {
 bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 {

-//#ifdef __DARWIN__
-//     wxHIDKeyboard keyboard;
-//     return keyboard.IsActive(key);
-//#else
-// TODO:  Have it use HID Manager on OSX...
+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+

 //if OS X > 10.2 (i.e. 10.2.x)
 //a known apple bug prevents the system from determining led
 //states with GetKeys... can only determine caps lock led
 //if OS X > 10.2 (i.e. 10.2.x)
 //a known apple bug prevents the system from determining led
 //states with GetKeys... can only determine caps lock led


@@ -1278,11 +1257,11 @@ bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
 //  KeyMapByteArray keymap; 
 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
 //  KeyMapByteArray keymap; 
 //  GetKeys((BigEndianLong*)keymap);
 //  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));

-//#endif

 }
 }

+#endif

 
 
 
 

-bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
+bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar  )

 {
     if ( !focus )
         return false ;
 {
     if ( !focus )
         return false ;


@@ -1299,7 +1278,6 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);

-        keycode = short(keyInfo & keyCodeMask) >> 8 ;

     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     long realkeyval = keyval ;
     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     long realkeyval = keyval ;


@@ -1310,6 +1288,39 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         keyval = wxToupper( keyval ) ;
     }
 
         keyval = wxToupper( keyval ) ;
     }
 

+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    {
+        keyval = keyval - '0' + WXK_NUMPAD0;
+    }
+    else if (keycode >= 67 && keycode <= 81)
+    {
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;
+        } // end switch
+    }
+

     wxKeyEvent event(wxEVT_KEY_DOWN);
     bool handled = false ;
     event.m_shiftDown = modifiers & shiftKey;
     wxKeyEvent event(wxEVT_KEY_DOWN);
     bool handled = false ;
     event.m_shiftDown = modifiers & shiftKey;


@@ -1317,10 +1328,14 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;

-
+#if wxUSE_UNICODE
+    event.m_uniChar = uniChar ;
+#endif
+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;

     event.m_x = wherex;
     event.m_y = wherey;
     event.m_x = wherex;
     event.m_y = wherey;

-    event.m_timeStamp = when;
+    event.SetTimestamp(when);

     event.SetEventObject(focus);
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )
     event.SetEventObject(focus);
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )


@@ -1349,6 +1364,23 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     }
     if (!handled)
     {
     }
     if (!handled)
     {

+        wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+        if (tlw)
+        {
+            event.Skip( FALSE ) ;
+            event.SetEventType( wxEVT_CHAR_HOOK );
+            // raw value again
+            event.m_keyCode = realkeyval ;
+
+            handled = tlw->GetEventHandler()->ProcessEvent( event );
+            if ( handled && event.GetSkipped() )
+                handled = false ;
+        }
+    }
+    
+    if ( !handled )
+    {        

         event.Skip( FALSE ) ;
         event.SetEventType( wxEVT_CHAR ) ;
         // raw value again
         event.Skip( FALSE ) ;
         event.SetEventType( wxEVT_CHAR ) ;
         // raw value again


@@ -1410,7 +1442,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     return handled ;
 }
 
     return handled ;
 }
 

-bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey )
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar  )

 {
     if ( !focus )
         return false ;
 {
     if ( !focus )
         return false ;


@@ -1426,7 +1458,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);
         UInt32 state = 0;
         UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
         keychar = short(keyInfo & charCodeMask);

-        keycode = short(keyInfo & keyCodeMask) >> 8 ;

     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 
     }
     long keyval = wxMacTranslateKey(keychar, keycode) ;
 


@@ -1434,6 +1465,40 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     {
         keyval = wxToupper( keyval ) ;
     }
     {
         keyval = wxToupper( keyval ) ;
     }

+
+    // Check for NUMPAD keys
+    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    {
+        keyval = keyval - '0' + WXK_NUMPAD0;
+    }
+    else if (keycode >= 67 && keycode <= 81)
+    {
+        switch (keycode)
+        {
+        case 76 :
+            keyval = WXK_NUMPAD_ENTER;
+            break;
+        case 81:
+            keyval = WXK_NUMPAD_EQUAL;
+            break;
+        case 67:
+            keyval = WXK_NUMPAD_MULTIPLY;
+            break;
+        case 75:
+            keyval = WXK_NUMPAD_DIVIDE;
+            break;
+        case 78:
+            keyval = WXK_NUMPAD_SUBTRACT;
+            break;
+        case 69:
+            keyval = WXK_NUMPAD_ADD;
+            break;
+        case 65:
+            keyval = WXK_NUMPAD_DECIMAL;
+            break;
+        } // end switch
+    }
+

     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);
     bool handled = false ;
 
     wxKeyEvent event(wxEVT_KEY_UP);


@@ -1442,10 +1507,15 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;
     event.m_altDown = modifiers & optionKey;
     event.m_metaDown = modifiers & cmdKey;
     event.m_keyCode = keyval ;

+#if wxUSE_UNICODE
+    event.m_uniChar = uniChar ;
+#endif

 
 

+    event.m_rawCode = keymessage;
+    event.m_rawFlags = modifiers;

     event.m_x = wherex;
     event.m_y = wherey;
     event.m_x = wherex;
     event.m_y = wherey;

-    event.m_timeStamp = when;
+    event.SetTimestamp(when);

     event.SetEventObject(focus);
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
 
     event.SetEventObject(focus);
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;