moving constructors to .cpp

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index bcf9cfb1d1ece1f0c91b19629338647cd92a6c9b..dd66fb10e44544197e576fd15e96616a29e3ca3e 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -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


@@ -295,6 +305,10 @@ void wxApp::MacNewFile()
 void wxApp::MacReopenApp()
 {
     // eventually check for open docs, if none, call MacNewFile
 void wxApp::MacReopenApp()
 {
     // eventually check for open docs, if none, call MacNewFile

+    wxTopLevelWindowMac* topLevelWindow = wxDynamicCast(GetTopWindow(), wxTopLevelWindowMac);
+
+    if (topLevelWindow && topLevelWindow->IsIconized())
+        topLevelWindow->Iconize(false);

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


@@ -327,55 +341,56 @@ 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();
+    EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+    EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+    wxTheApp->MacSetCurrentEvent( event , handler ) ;
+    
+    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;
+        }

 
 

+        if ( type )
+        {

             wxMenuEvent wxevent(type, cmd);
             wxMenuEvent wxevent(type, cmd);

-            wxevent.SetEventObject(win);
+            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);
+                }
+            }

     }
     }

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

 
     return eventNotHandledErr;
 }
 
     return eventNotHandledErr;
 }


@@ -386,32 +401,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 +434,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 ;
 }
 


@@ -724,15 +738,15 @@ void wxStAppResource::OpenSharedLibraryResource(const void *initBlock)
         NSModule    theModule;
         const char *theLibPath;
 
         NSModule    theModule;
         const char *theLibPath;
 

-        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWindows"));
+        gSharedLibraryBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.wxwindows.wxWidgets"));

         if (gSharedLibraryBundle != NULL) {
         if (gSharedLibraryBundle != NULL) {

-            // wxWindows has been bundled into a framework
+            // wxWidgets has been bundled into a framework

             //   load the framework resources
 
             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {
             //   load the framework resources
 
             gSharedLibraryResource = CFBundleOpenBundleResourceMap(gSharedLibraryBundle);
         }
         else {

-            // wxWindows is a simple dynamic shared library
+            // wxWidgets is a simple dynamic shared library

             //   load the resources from the data fork of a separate resource file
             wxString theResPath;
             wxString theName;
             //   load the resources from the data fork of a separate resource file
             wxString theResPath;
             wxString theName;


@@ -934,18 +948,23 @@ wxApp::wxApp()
 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?


@@ -1028,9 +1047,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 +1093,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 )
     {