splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index a48440d002189e6f3782ff805efdae77290f3a8a..749119f1bf548fba663006cacac509377c42169a 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -39,33 +39,19 @@
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/link.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
 #include "wx/link.h"

+#include "wx/thread.h"

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

-#ifndef __DARWIN__
-    #if __option(profile)
-        #include <profiler.h>
-    #endif
-#endif
-
-// #include "apprsrc.h"
-

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

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

 
 #ifdef __DARWIN__
 #  include <CoreServices/CoreServices.h>
 #  if defined(WXMAKINGDLL_CORE)
 #    include <mach-o/dyld.h>
 #  endif
 
 #ifdef __DARWIN__
 #  include <CoreServices/CoreServices.h>
 #  if defined(WXMAKINGDLL_CORE)
 #    include <mach-o/dyld.h>
 #  endif

-#else
-#  include <Sound.h>
-#  include <Threads.h>
-#  include <ToolUtils.h>
-#  include <DiskInit.h>
-#  include <Devices.h>

 #endif
 
 // Keep linker from discarding wxStockGDIMac
 #endif
 
 // Keep linker from discarding wxStockGDIMac


@@ -133,7 +119,7 @@ pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 

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

 {
     return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ;
 }
 {
     return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ;
 }


@@ -295,7 +281,7 @@ void wxApp::MacOpenFile(const wxString & fileName )
 #endif
 }
 
 #endif
 }
 

-void wxApp::MacOpenURL(const wxString & url )
+void wxApp::MacOpenURL(const wxString & WXUNUSED(url) )

 {
 }
 
 {
 }
 


@@ -355,18 +341,25 @@ void wxApp::MacReopenApp()
     else
     {
         wxTopLevelWindow* firstIconized = NULL ;
     else
     {
         wxTopLevelWindow* firstIconized = NULL ;

+        wxTopLevelWindow* firstHidden = NULL ;

         while (node)
         {
             wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();
         while (node)
         {
             wxTopLevelWindow* win = (wxTopLevelWindow*) node->GetData();

-            if ( !win->IsIconized() )
+            if ( !win->IsShown() )

             {
             {

-                firstIconized = NULL ;
-                break ;
+                // make sure we don't show 'virtual toplevel windows' like wxTaskBarIconWindow
+                if ( firstHidden == NULL && ( wxDynamicCast( win, wxFrame ) || wxDynamicCast( win, wxDialog ) ) )
+                   firstHidden = win ;
+            } 
+            else if ( win->IsIconized() )
+            { 
+                if ( firstIconized == NULL )
+                    firstIconized = win ;

             }
             else
             {
             }
             else
             {

-                if ( firstIconized == NULL )
-                    firstIconized = win ;
+                // we do have a visible, non-iconized toplevelwindow -> do nothing
+                return;

             }
 
             node = node->GetNext();
             }
 
             node = node->GetNext();


@@ -374,6 +367,8 @@ void wxApp::MacReopenApp()
 
         if ( firstIconized )
             firstIconized->Iconize( false ) ;
 
         if ( firstIconized )
             firstIconized->Iconize( false ) ;

+        else if ( firstHidden )
+            firstHidden->Show( true );

     }
 }
 
     }
 }
 


@@ -469,6 +464,7 @@ UInt32 wxIdToMacCommand( int wxId )
 wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
 {
     wxMenu* itemMenu = NULL ;
 wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
 {
     wxMenu* itemMenu = NULL ;

+#ifndef __WXUNIVERSAL__

     int id = 0 ;
 
     // for 'standard' commands which don't have a wx-menu
     int id = 0 ;
 
     // for 'standard' commands which don't have a wx-menu


@@ -511,7 +507,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
                 item = (wxMenuItem*) refCon ;
         }
     }
                 item = (wxMenuItem*) refCon ;
         }
     }

-
+#endif

     return itemMenu ;
 }
 
     return itemMenu ;
 }
 


@@ -543,10 +539,13 @@ static const EventTypeSpec eventList[] =
 } ;
 
 static pascal OSStatus
 } ;
 
 static pascal OSStatus

-wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+wxMacAppMenuEventHandler( EventHandlerCallRef WXUNUSED(handler),
+                          EventRef event,
+                          void *WXUNUSED(data) )

 {
     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
 {
     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;

+#ifndef __WXUNIVERSAL__

     wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
 
     if ( menu )
     wxMenu* menu = wxFindMenuFromMacMenu( menuRef ) ;
 
     if ( menu )


@@ -588,15 +587,19 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
             {
                 wxWindow *win = menu->GetInvokingWindow();
                 if (win)
             {
                 wxWindow *win = menu->GetInvokingWindow();
                 if (win)

-                    win->GetEventHandler()->ProcessEvent(wxevent);
+                    win->HandleWindowEvent(wxevent);

                 }
             }
     }
                 }
             }
     }

-
+#endif

     return eventNotHandledErr;
 }
 
     return eventNotHandledErr;
 }
 

-static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+#ifndef __LP64__
+static pascal OSStatus
+wxMacAppCommandEventHandler( EventHandlerCallRef WXUNUSED(handler) ,
+                             EventRef event ,
+                             void *WXUNUSED(data) )

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -616,60 +619,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :

-            {
-                if (item->IsCheckable())
-                    item->Check( !item->IsChecked() ) ;
-
-                if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
-                    result = noErr ;
-            }
+                result = itemMenu->MacHandleCommandProcess( item, id );

             break ;
 
         case kEventCommandUpdateStatus:
             break ;
 
         case kEventCommandUpdateStatus:

-            {
-                wxUpdateUIEvent event(id);
-                event.SetEventObject( itemMenu );
-
-                bool processed = false;
-
-                // Try the menu's event handler
-                {
-                    wxEvtHandler *handler = itemMenu->GetEventHandler();
-                    if ( handler )
-                        processed = handler->ProcessEvent(event);
-                }
-
-                // Try the window the menu was popped up from
-                // (and up through the hierarchy)
-                if ( !processed )
-                {
-                    const wxMenuBase *menu = itemMenu;
-                    while ( menu )
-                    {
-                        wxWindow *win = menu->GetInvokingWindow();
-                        if ( win )
-                        {
-                            processed = win->GetEventHandler()->ProcessEvent(event);
-                            break;
-                        }
-
-                        menu = menu->GetParent();
-                    }
-                }
-
-                if ( processed )
-                {
-                    // if anything changed, update the changed attribute
-                    if (event.GetSetText())
-                        itemMenu->SetLabel(id, event.GetText());
-                    if (event.GetSetChecked())
-                        itemMenu->Check(id, event.GetChecked());
-                    if (event.GetSetEnabled())
-                        itemMenu->Enable(id, event.GetEnabled());
-
-                    result = noErr ;
-                }
-            }
+                result = itemMenu->MacHandleCommandUpdateStatus( item, id );

             break ;
 
         default :
             break ;
 
         default :


@@ -678,8 +632,12 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     }
     return result ;
 }
     }
     return result ;
 }

+#endif

 
 

-static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus
+wxMacAppApplicationEventHandler( EventHandlerCallRef WXUNUSED(handler) ,
+                                 EventRef event ,
+                                 void *WXUNUSED(data) )

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


@@ -712,14 +670,15 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventClass( event ) )
     {
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventClass( event ) )
     {

+#ifndef __LP64__

         case kEventClassCommand :
             result = wxMacAppCommandEventHandler( handler , event , data ) ;
             break ;
         case kEventClassCommand :
             result = wxMacAppCommandEventHandler( handler , event , data ) ;
             break ;

-
+#endif

         case kEventClassApplication :
             result = wxMacAppApplicationEventHandler( handler , event , data ) ;
             break ;
         case kEventClassApplication :
             result = wxMacAppApplicationEventHandler( handler , event , data ) ;
             break ;

-
+#ifndef __LP64__

         case kEventClassMenu :
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;
         case kEventClassMenu :
             result = wxMacAppMenuEventHandler( handler , event , data ) ;
             break ;


@@ -737,13 +696,23 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
                     result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
             }
             break ;
                     result = wxMacTopLevelMouseEventHandler( handler , event , NULL ) ;
             }
             break ;

-
+#endif

         case kEventClassAppleEvent :
             {
         case kEventClassAppleEvent :
             {

-                EventRecord rec ;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( AEProcessEvent != NULL )
+                {
+                    result = AEProcessEvent(event);
+                }
+#endif
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+                {
+                    EventRecord rec ;

 
 

-                wxMacConvertEventToRecord( event , &rec ) ;
-                result = AEProcessAppleEvent( &rec ) ;
+                    wxMacConvertEventToRecord( event , &rec ) ;
+                    result = AEProcessAppleEvent( &rec ) ;
+                }
+#endif

             }
             break ;
 
             }
             break ;
 


@@ -760,9 +729,16 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
 #ifdef __WXDEBUG__
 
 
 #ifdef __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 WXUNUSED(componentSignature),
+                         UInt32 WXUNUSED(options),
+                         const char *assertionString,
+                         const char *exceptionLabelString,
+                         const char *errorString,
+                         const char *fileName,
+                         long lineNumber,
+                         void *value,
+                         ConstStr255Param WXUNUSED(outputMsg))

 {
     // flow into assert handling
     wxString fileNameStr ;
 {
     // flow into assert handling
     wxString fileNameStr ;


@@ -799,18 +775,10 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 
 #endif //__WXDEBUG__
 
 
 #endif //__WXDEBUG__
 

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

 {
     wxTheApp->ProcessPendingEvents();
 }
 {
     wxTheApp->ProcessPendingEvents();
 }

-#endif

 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
 
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {


@@ -821,23 +789,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 #endif
 
     UMAInitToolbox( 4, sm_isEmbedded ) ;
 #endif
 
     UMAInitToolbox( 4, sm_isEmbedded ) ;

-    SetEventMask( everyEvent ) ;
-    UMAShowWatchCursor() ;
-
-#ifndef __DARWIN__
-#  if __option(profile)
-    ProfilerInit( collectDetailed, bestTimeBase , 40000 , 50 ) ;
-#  endif
-#endif
-
-#ifndef __DARWIN__
-    // now avoid exceptions thrown for new (bad_alloc)
-    // FIXME CS for some changes outside wxMac does not compile anymore
-#if 0
-    std::__throws_bad_alloc = 0 ;
-#endif
-
-#endif
+// TODO CHECK Can Be Removed    SetEventMask( everyEvent ) ;

 
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
 
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be


@@ -861,7 +813,6 @@ 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") )
     // 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") )


@@ -871,14 +822,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         CFRelease( url ) ;
         CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
         CFRelease( urlParent ) ;
         CFRelease( url ) ;
         CFStringRef path = CFURLCopyFileSystemPath ( urlParent , kCFURLPOSIXPathStyle ) ;
         CFRelease( urlParent ) ;

-        wxString cwd = wxMacCFStringHolder(path).AsString(wxLocale::GetSystemEncoding());
+        wxString cwd = wxCFStringRef(path).AsString(wxLocale::GetSystemEncoding());

         wxSetWorkingDirectory( cwd ) ;
     }
         wxSetWorkingDirectory( cwd ) ;
     }

-#endif
-
-    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};
     /* 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};


@@ -887,9 +834,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
        // run loop takes ownership
        CFRelease(m_macEventPosted);
     CFRunLoopAddSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
        // run loop takes ownership
        CFRelease(m_macEventPosted);

-#endif
-
-    UMAShowArrowCursor() ;

 
     return true;
 }
 
     return true;
 }


@@ -905,15 +849,15 @@ bool wxApp::OnInitGui()
 {
     if ( !wxAppBase::OnInitGui() )
         return false ;
 {
     if ( !wxAppBase::OnInitGui() )
         return false ;

-
+#ifndef __LP64__

     InstallStandardEventHandler( GetApplicationEventTarget() ) ;
     InstallStandardEventHandler( GetApplicationEventTarget() ) ;

-

     if (!sm_isEmbedded)
     {
         InstallApplicationEventHandler(
             GetwxMacAppEventHandlerUPP(),
             GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
     }
     if (!sm_isEmbedded)
     {
         InstallApplicationEventHandler(
             GetwxMacAppEventHandlerUPP(),
             GetEventTypeCount(eventList), eventList, wxTheApp, (EventHandlerRef *)&(wxTheApp->m_macEventHandler));
     }

+#endif

 
     if (!sm_isEmbedded)
     {
 
     if (!sm_isEmbedded)
     {


@@ -938,6 +882,9 @@ bool wxApp::OnInitGui()
                                sQuitHandler , 0 , FALSE ) ;
     }
 
                                sQuitHandler , 0 , FALSE ) ;
     }
 

+    if ( !wxMacInitCocoa() )
+        return false;
+

     return true ;
 }
 
     return true ;
 }
 


@@ -947,28 +894,15 @@ void wxApp::CleanUp()
     wxToolTip::RemoveToolTips() ;
 #endif
 
     wxToolTip::RemoveToolTips() ;
 #endif
 

-#ifdef __WXMAC_OSX__

     if (m_macEventPosted)
        {
                CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
                m_macEventPosted = NULL;
        }
     if (m_macEventPosted)
        {
                CFRunLoopRemoveSource(CFRunLoopGetCurrent(), m_macEventPosted, kCFRunLoopCommonModes);
                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();
 

-    wxMacDestroyNotifierTable() ;
-
-#ifndef __DARWIN__
-#  if __option(profile)
-    ProfilerDump( (StringPtr)"\papp.prof" ) ;
-    ProfilerTerm() ;
-#  endif
-#endif
-
-    UMACleanupToolbox() ;
-

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


@@ -1002,31 +936,7 @@ void wxApp::CleanUp()
 // misc initialization stuff
 //----------------------------------------------------------------------
 
 // misc initialization stuff
 //----------------------------------------------------------------------
 

-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-
-// for shared libraries we have to manually get the correct resource
-// ref num upon initializing and releasing when terminating, therefore
-// the __wxinitialize and __wxterminate must be used
-
-extern "C"
-{
-    void __sinit(void);    // (generated by linker)
-    pascal OSErr __initialize(const CFragInitBlock *theInitBlock);
-    pascal void __terminate(void);
-}
-
-pascal OSErr __wxinitialize(const CFragInitBlock *theInitBlock)
-{
-    return __initialize( theInitBlock ) ;
-}
-
-pascal void __wxterminate(void)
-{
-    __terminate() ;
-}
-
-#endif /* WXMAKINGDLL_CORE && !__DARWIN__ */
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5

 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 {
     OSStatus err = noErr ;
 bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 {
     OSStatus err = noErr ;


@@ -1067,9 +977,7 @@ 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);


@@ -1094,10 +1002,7 @@ 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);


@@ -1121,6 +1026,7 @@ bool wxMacConvertEventToRecord( EventRef event , EventRecord *rec)
 
     return converted ;
 }
 
     return converted ;
 }

+#endif

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {


@@ -1128,33 +1034,26 @@ wxApp::wxApp()
 
     m_macCurrentEvent = NULL ;
     m_macCurrentEventHandlerCallRef = NULL ;
 
     m_macCurrentEvent = NULL ;
     m_macCurrentEventHandlerCallRef = NULL ;

-
-#ifdef __WXMAC_OSX__

     m_macEventPosted = NULL ;
     m_macEventPosted = NULL ;

-#endif

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))

 {
 {

-    wxAppBase::OnIdle(event);
-

     // If they are pending events, we must process them: pending events are
     // either events to the threads other than main or events posted with
     // wxPostEvent() functions
     // If they are pending events, we must process them: pending events are
     // either events to the threads other than main or events posted with
     // wxPostEvent() functions

-    wxMacProcessNotifierAndPendingEvents();
-
+#ifndef __WXUNIVERSAL__

   if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
   if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();

+#endif

 }
 
 void wxApp::WakeUpIdle()
 {
 }
 
 void wxApp::WakeUpIdle()
 {

-#ifdef __WXMAC_OSX__

     if (m_macEventPosted)
     {
         CFRunLoopSourceSignal(m_macEventPosted);
     }
     if (m_macEventPosted)
     {
         CFRunLoopSourceSignal(m_macEventPosted);
     }

-#endif

 
     wxMacWakeUp() ;
 }
 
     wxMacWakeUp() ;
 }


@@ -1236,7 +1135,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
         }
     }
 
         }
     }
 

-    wxMacProcessNotifierAndPendingEvents() ;

     s_inYield = false;
 
     return true;
     s_inYield = false;
 
     return true;


@@ -1244,6 +1142,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
 void wxApp::MacDoOneEvent()
 {
 
 void wxApp::MacDoOneEvent()
 {

+    wxMacAutoreleasePool autoreleasepool;

     EventRef theEvent;
 
     s_inReceiveEvent = true ;
     EventRef theEvent;
 
     s_inReceiveEvent = true ;


@@ -1273,11 +1172,10 @@ void wxApp::MacDoOneEvent()
     // repeaters
 
     DeletePendingObjects() ;
     // repeaters
 
     DeletePendingObjects() ;

-    wxMacProcessNotifierAndPendingEvents() ;

 }
 
 // virtual
 }
 
 // virtual

-void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
+void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) )

 {
     // Override to process unhandled events as you please
 }
 {
     // Override to process unhandled events as you please
 }


@@ -1300,8 +1198,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
     if (status == eventNotHandledErr)
         MacHandleUnhandledEvent(evr);
 
     if (status == eventNotHandledErr)
         MacHandleUnhandledEvent(evr);
 

-    wxMacProcessNotifierAndPendingEvents() ;
-

 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
     wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS


@@ -1480,24 +1376,6 @@ int wxMacKeyCodeToModifier(wxKeyCode key)
     }
 }
 
     }
 }
 

-#ifndef __DARWIN__
-bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below
-{
-    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
-     return !!(GetCurrentKeyModifiers() & wxMacKeyCodeToModifier(key));
-//else
-//  KeyMapByteArray keymap;
-//  GetKeys((BigEndianLong*)keymap);
-//  return !!(BitTst(keymap, (sizeof(KeyMapByteArray)*8) - iKey));
-}
-#endif
-
-

 wxMouseState wxGetMouseState()
 {
     wxMouseState ms;
 wxMouseState wxGetMouseState()
 {
     wxMouseState ms;


@@ -1506,16 +1384,10 @@ wxMouseState wxGetMouseState()
     ms.SetX(pt.x);
     ms.SetY(pt.y);
 
     ms.SetX(pt.x);
     ms.SetY(pt.y);
 

-#if TARGET_API_MAC_OSX

     UInt32 buttons = GetCurrentButtonState();
     ms.SetLeftDown( (buttons & 0x01) != 0 );
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );
     UInt32 buttons = GetCurrentButtonState();
     ms.SetLeftDown( (buttons & 0x01) != 0 );
     ms.SetMiddleDown( (buttons & 0x04) != 0 );
     ms.SetRightDown( (buttons & 0x02) != 0 );

-#else
-    ms.SetLeftDown( Button() );
-    ms.SetMiddleDown( 0 );
-    ms.SetRightDown( 0 );
-#endif

 
     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);
 
     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);


@@ -1537,7 +1409,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    handled = focus->HandleWindowEvent( event ) ;

     if ( handled && event.GetSkipped() )
         handled = false ;
 
     if ( handled && event.GetSkipped() )
         handled = false ;
 


@@ -1584,7 +1456,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     bool handled;
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     bool handled;
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+    handled = focus->HandleWindowEvent( event ) ;

 
     return handled ;
 }
 
     return handled ;
 }


@@ -1605,7 +1477,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );

-        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        handled = tlw->HandleWindowEvent( event );

         if ( handled && event.GetSkipped() )
             handled = false ;
     }
         if ( handled && event.GetSkipped() )
             handled = false ;
     }


@@ -1614,7 +1486,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     {
         event.SetEventType( wxEVT_CHAR );
         event.Skip( false ) ;
     {
         event.SetEventType( wxEVT_CHAR );
         event.Skip( false ) ;

-        handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+        handled = focus->HandleWindowEvent( event ) ;

     }
 
     if ( !handled && (keyval == WXK_TAB) )
     }
 
     if ( !handled && (keyval == WXK_TAB) )


@@ -1630,7 +1502,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( event.ControlDown() );
                 new_event.SetCurrentFocus( focus );
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( event.ControlDown() );
                 new_event.SetCurrentFocus( focus );

-                handled = focus->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                handled = focus->GetParent()->HandleWindowEvent( new_event );

                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }
                 if ( handled && new_event.GetSkipped() )
                     handled = false ;
             }


@@ -1644,6 +1516,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     {
         // if window is not having a focus still testing for default enter or cancel
         // TODO: add the UMA version for ActiveNonFloatingWindow
     {
         // if window is not having a focus still testing for default enter or cancel
         // TODO: add the UMA version for ActiveNonFloatingWindow

+#ifndef __LP64__

         wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
         if ( focus )
         {
         wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
         if ( focus )
         {


@@ -1668,9 +1541,10 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
                 // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
                 wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
                 new_event.SetEventObject( focus );
                 // generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs)
                 wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
                 new_event.SetEventObject( focus );

-                handled = focus->GetEventHandler()->ProcessEvent( new_event );
+                handled = focus->HandleWindowEvent( new_event );

             }
         }
             }
         }

+#endif

     }
     return handled ;
 }
     }
     return handled ;
 }


@@ -1686,57 +1560,65 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     {
         // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
         // and look at the character after
     {
         // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
         // and look at the character after

+#ifdef __LP64__
+               // TODO new implementation using TextInputSources
+#else

         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);

+#endif

     }
 
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
         keyval = wxToupper( keyval ) ;
 
     }
 
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )
         keyval = wxToupper( keyval ) ;
 

-    // Check for NUMPAD keys
-    if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)
+    // Check for NUMPAD keys.  For KEY_UP/DOWN events we need to use the
+    // WXK_NUMPAD constants, but for the CHAR event we want to use the
+    // standard ascii values
+    if ( event.GetEventType() != wxEVT_CHAR )

     {
     {

-        keyval = (keyval - '0') + WXK_NUMPAD0;
-    }
-    else if (keycode >= 67 && keycode <= 81)
-    {
-        switch (keycode)
+        if (keyval >= '0' && keyval <= '9' && keycode >= 82 && keycode <= 92)

         {
         {

-        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;
-
-        default:
-            break;
-        } // end switch
+            keyval = (keyval - '0') + WXK_NUMPAD0;
+        }
+        else if (keycode >= 65 && 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;
+                default:
+                    break;
+            }
+        }

     }
     }

-
+    

     event.m_shiftDown = modifiers & shiftKey;
     event.m_controlDown = modifiers & controlKey;
     event.m_altDown = modifiers & optionKey;
     event.m_shiftDown = modifiers & shiftKey;
     event.m_controlDown = modifiers & controlKey;
     event.m_altDown = modifiers & optionKey;


@@ -1753,3 +1635,14 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     event.SetTimestamp(when);
     event.SetEventObject(focus);
 }
     event.SetTimestamp(when);
     event.SetEventObject(focus);
 }

+
+
+void wxApp::MacHideApp()
+{
+    wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess );
+    HICommand command;
+    memset( &command, 0 , sizeof(command) );
+    command.commandID = kHICommandHide ;
+    event.SetParameter<HICommand>(kEventParamDirectObject, command );       
+    SendEventToApplication( event );
+}