make sure we catch invalid control refs better

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

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 8a3e1eb8d8b0a54e840716b82e2ba1b90340e329..080f0dcb35b83d7113f90e50d2d6b4029607c182 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.cpp
+// Name:        src/mac/carbon/app.cpp
 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:
@@ -11,38 +11,43 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/button.h"
 #include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"
-#include "wx/intl.h"
-#include "wx/icon.h"
-#include "wx/palette.h"
-#include "wx/dc.h"
-#include "wx/dialog.h"
-#include "wx/msgdlg.h"
-#include "wx/log.h"
-#include "wx/module.h"
-#include "wx/memory.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/pen.h"
+    #include "wx/brush.h"
+    #include "wx/palette.h"
+    #include "wx/icon.h"
+    #include "wx/cursor.h"
+    #include "wx/dialog.h"
+    #include "wx/msgdlg.h"
+    #include "wx/textctrl.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+#endif
+
 #include "wx/tooltip.h"
-#include "wx/textctrl.h"
-#include "wx/menu.h"
 #include "wx/docview.h"
 #include "wx/filename.h"
+#include "wx/link.h"
 
 #include <string.h>
 
 // mac
 
 #ifndef __DARWIN__
-  #if __option(profile)
-    #include <profiler.h>
-  #endif
+    #if __option(profile)
+        #include <profiler.h>
+    #endif
 #endif
 
 // #include "apprsrc.h"
@@ -63,7 +68,8 @@
 #  include <Devices.h>
 #endif
 
-extern wxList wxPendingDelete;
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)
 
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
@@ -359,7 +365,7 @@ struct IdPair
     int wxId ;
 } ;
 
-IdPair gCommandIds [] = 
+IdPair gCommandIds [] =
 {
     { kHICommandCut ,           wxID_CUT } ,
     { kHICommandCopy ,          wxID_COPY } ,
@@ -370,10 +376,10 @@ IdPair gCommandIds [] =
     { kHICommandRedo ,          wxID_REDO } ,
 } ;
 
-int wxMacCommandToId( UInt32 macCommandId ) 
+int wxMacCommandToId( UInt32 macCommandId )
 {
     int wxid = 0 ;
-    
+
     switch ( macCommandId )
     {
         case kHICommandPreferences :
@@ -408,10 +414,10 @@ int wxMacCommandToId( UInt32 macCommandId )
     return wxid ;
 }
 
-UInt32 wxIdToMacCommand( int wxId ) 
+UInt32 wxIdToMacCommand( int wxId )
 {
     UInt32 macId = 0 ;
-    
+
     if ( wxId == wxApp::s_macPreferencesMenuItemId )
         macId = kHICommandPreferences ;
     else if (wxId == wxApp::s_macExitMenuItemId)
@@ -436,7 +442,7 @@ UInt32 wxIdToMacCommand( int wxId )
     return macId ;
 }
 
-wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) 
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;
@@ -581,7 +587,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     if ( item )
     {
         wxASSERT( itemMenu != NULL ) ;
-        
+
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :
@@ -598,16 +604,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
             {
                 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 )
@@ -621,11 +627,11 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
                             processed = win->GetEventHandler()->ProcessEvent(event);
                             break;
                         }
-                        
+
                         menu = menu->GetParent();
                     }
                 }
-                
+
                 if ( processed )
                 {
                     // if anything changed, update the changed attribute
@@ -727,11 +733,6 @@ pascal OSStatus wxMacAppEventHandler( EventHandlerCallRef handler , EventRef eve
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
-#if defined(WXMAKINGDLL_CORE) && !defined(__DARWIN__)
-// we know it's there ;-)
-WXIMPORT char std::__throws_bad_alloc ;
-#endif
-
 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
@@ -1254,7 +1255,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 #endif // wxUSE_THREADS
 }
 
-long wxMacTranslateKey(unsigned char key, unsigned char code) ;
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
@@ -1474,10 +1474,10 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     if ( !focus )
         return false ;
 
-    bool handled; 
+    bool handled;
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
-        
+
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     if ( handled && event.GetSkipped() )
         handled = false ;
@@ -1516,7 +1516,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-    
+
     return handled ;
 }
 
@@ -1524,7 +1524,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
 {
     if ( !focus )
         return false ;
-    
+
     wxKeyEvent event(wxEVT_CHAR) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
     long keyval = event.m_keyCode ;
@@ -1532,7 +1532,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     bool handled = false ;
 
     wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
-        
+
     if (tlw)
     {
         event.SetEventType( wxEVT_CHAR_HOOK );
@@ -1547,7 +1547,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
         event.Skip( false ) ;
         handled = focus->GetEventHandler()->ProcessEvent( event ) ;
     }
-        
+
     if ( !handled && (keyval == WXK_TAB) )
     {
         wxWindow* iter = focus->GetParent() ;
@@ -1580,14 +1580,18 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
         {
             if ( keyval == WXK_RETURN )
             {
-                wxButton *def = wxDynamicCast(focus->GetDefaultItem(), wxButton);
-                if ( def && def->IsEnabled() )
+                wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(focus), wxTopLevelWindow);
+                if ( tlw && tlw->GetDefaultItem() )
                 {
-                    wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
-                    event.SetEventObject(def);
-                    def->Command(event);
+                    wxButton *def = wxDynamicCast(tlw->GetDefaultItem(), wxButton);
+                    if ( def && def->IsEnabled() )
+                    {
+                        wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
+                        event.SetEventObject(def);
+                        def->Command(event);
 
-                    return true ;
+                        return true ;
+                    }
                 }
             }
             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
@@ -1602,7 +1606,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     return handled ;
 }
 
-// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events. 
+// This method handles common code for SendKeyDown, SendKeyUp, and SendChar events.
 void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
     short keycode, keychar ;
@@ -1671,8 +1675,6 @@ void wxApp::MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymess
     event.m_keyCode = keyval ;
 #if wxUSE_UNICODE
     event.m_uniChar = uniChar ;
-    if ( event.GetEventType() == wxEVT_CHAR )
-        event.m_keyCode = uniChar ;
 #endif
 
     event.m_rawCode = keymessage;