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 49c9ce465520218315d99232543c396451eb5209..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:
 // Purpose:     wxApp
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,38 +11,43 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

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

 #include "wx/app.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/tooltip.h"

-#include "wx/textctrl.h"
-#include "wx/menu.h"

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

+#include "wx/link.h"

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

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

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


@@ -63,7 +68,8 @@
 #  include <Devices.h>
 #endif
 
 #  include <Devices.h>
 #endif
 

-extern wxList wxPendingDelete;
+// Keep linker from discarding wxStockGDIMac
+wxFORCE_LINK_MODULE(gdiobj)

 
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;
 
 #if wxUSE_THREADS
 extern size_t g_numberOfThreads;


@@ -359,7 +365,7 @@ struct IdPair
     int wxId ;
 } ;
 
     int wxId ;
 } ;
 

-IdPair gCommandIds [] = 
+IdPair gCommandIds [] =

 {
     { kHICommandCut ,           wxID_CUT } ,
     { kHICommandCopy ,          wxID_COPY } ,
 {
     { kHICommandCut ,           wxID_CUT } ,
     { kHICommandCopy ,          wxID_COPY } ,


@@ -370,10 +376,10 @@ IdPair gCommandIds [] =
     { kHICommandRedo ,          wxID_REDO } ,
 } ;
 
     { kHICommandRedo ,          wxID_REDO } ,
 } ;
 

-int wxMacCommandToId( UInt32 macCommandId ) 
+int wxMacCommandToId( UInt32 macCommandId )

 {
     int wxid = 0 ;
 {
     int wxid = 0 ;

-    
+

     switch ( macCommandId )
     {
         case kHICommandPreferences :
     switch ( macCommandId )
     {
         case kHICommandPreferences :


@@ -408,10 +414,10 @@ int wxMacCommandToId( UInt32 macCommandId )
     return wxid ;
 }
 
     return wxid ;
 }
 

-UInt32 wxIdToMacCommand( int wxId ) 
+UInt32 wxIdToMacCommand( int wxId )

 {
     UInt32 macId = 0 ;
 {
     UInt32 macId = 0 ;

-    
+

     if ( wxId == wxApp::s_macPreferencesMenuItemId )
         macId = kHICommandPreferences ;
     else if (wxId == wxApp::s_macExitMenuItemId)
     if ( wxId == wxApp::s_macPreferencesMenuItemId )
         macId = kHICommandPreferences ;
     else if (wxId == wxApp::s_macExitMenuItemId)


@@ -436,7 +442,7 @@ UInt32 wxIdToMacCommand( int wxId )
     return macId ;
 }
 
     return macId ;
 }
 

-wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item ) 
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )

 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;
 {
     wxMenu* itemMenu = NULL ;
     int id = 0 ;


@@ -581,7 +587,7 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     if ( item )
     {
         wxASSERT( itemMenu != NULL ) ;
     if ( item )
     {
         wxASSERT( itemMenu != NULL ) ;

-        
+

         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :


@@ -598,16 +604,16 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
             {
                 wxUpdateUIEvent event(id);
                 event.SetEventObject( itemMenu );
             {
                 wxUpdateUIEvent event(id);
                 event.SetEventObject( itemMenu );

-                                
+

                 bool processed = false;
                 bool processed = false;

-                
+

                 // Try the menu's event handler
                 {
                     wxEvtHandler *handler = itemMenu->GetEventHandler();
                     if ( handler )
                         processed = handler->ProcessEvent(event);
                 }
                 // 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 )
                 // 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;
                         }
                             processed = win->GetEventHandler()->ProcessEvent(event);
                             break;
                         }

-                        
+

                         menu = menu->GetParent();
                     }
                 }
                         menu = menu->GetParent();
                     }
                 }

-                
+

                 if ( processed )
                 {
                     // if anything changed, update the changed attribute
                 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 )
 
 
 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,
 #ifdef __WXDEBUG__
 
 pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,


@@ -1254,7 +1255,6 @@ void wxApp::MacHandleOneEvent( WXEVENTREF evr )
 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS
 }
 

-long wxMacTranslateKey(unsigned char key, unsigned char code) ;

 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;
 long wxMacTranslateKey(unsigned char key, unsigned char code)
 {
     long retval = key ;


@@ -1447,11 +1447,17 @@ 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);
     ms.SetShiftDown(modifiers & shiftKey);
     UInt32 modifiers = GetCurrentKeyModifiers();
     ms.SetControlDown(modifiers & controlKey);
     ms.SetShiftDown(modifiers & shiftKey);


@@ -1461,95 +1467,17 @@ wxMouseState wxGetMouseState()
     return ms;
 }
 
     return ms;
 }
 

+// TODO : once the new key/char handling is tested, move all the code to wxWindow

 
 bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
     if ( !focus )
         return false ;
 
 
 bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
 {
     if ( !focus )
         return false ;
 

-    short keycode ;
-    short keychar ;
-    keychar = short(keymessage & charCodeMask);
-    keycode = short(keymessage & keyCodeMask) >> 8 ;
-
-    if ( modifiers & ( controlKey|shiftKey|optionKey ) )
-    {
-        // control interferes with some built-in keys like pgdown, return etc. therefore we remove the controlKey modifier
-        // and look at the character after
-        UInt32 state = 0;
-        UInt32 keyInfo = KeyTranslate((Ptr)GetScriptManagerVariable(smKCHRCache), ( modifiers & (~(controlKey|shiftKey|optionKey))) | keycode, &state);
-        keychar = short(keyInfo & charCodeMask);
-    }
-
-    long keyval = wxMacTranslateKey(keychar, keycode) ;
-    long realkeyval = keyval ;
-    if ( keyval == keychar )
-    {
-        // we are not on a special character combo -> pass the real os event-value to EVT_CHAR, but not to EVT_KEY (make upper first)
-        realkeyval = short(keymessage & charCodeMask) ;
-        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;
-
-        default:
-            break;
-        } // end switch
-    }
+    bool handled;
+    wxKeyEvent event(wxEVT_KEY_DOWN) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;

 
 

-    wxKeyEvent event(wxEVT_KEY_DOWN);
-    bool handled = false ;
-    event.m_shiftDown = modifiers & shiftKey;
-    event.m_controlDown = modifiers & controlKey;
-    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.SetTimestamp(when);
-    event.SetEventObject(focus);

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


@@ -1576,34 +1504,48 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     }
 #endif // wxUSE_ACCEL
 
     }
 #endif // wxUSE_ACCEL
 

-    if (!handled)
-    {
-        wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+    return handled ;
+}

 
 

-        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 ;
-        }
+bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    bool handled;
+    wxKeyEvent event( wxEVT_KEY_UP ) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
+
+    return handled ;
+}
+
+bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
+{
+    if ( !focus )
+        return false ;
+
+    wxKeyEvent event(wxEVT_CHAR) ;
+    MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
+    long keyval = event.m_keyCode ;
+
+    bool handled = false ;
+
+    wxTopLevelWindowMac *tlw = focus->MacGetTopLevelWindow() ;
+
+    if (tlw)
+    {
+        event.SetEventType( wxEVT_CHAR_HOOK );
+        handled = tlw->GetEventHandler()->ProcessEvent( event );
+        if ( handled && event.GetSkipped() )
+            handled = false ;

     }
 
     if ( !handled )
     {
     }
 
     if ( !handled )
     {

+        event.SetEventType( wxEVT_CHAR );

         event.Skip( false ) ;
         event.Skip( false ) ;

-        event.SetEventType( wxEVT_CHAR ) ;
-
-        // raw value again
-        event.m_keyCode = realkeyval ;
-

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

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

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


@@ -1638,14 +1580,18 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
         {
             if ( keyval == WXK_RETURN )
             {
         {
             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 ) )
                 }
             }
             else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )


@@ -1657,20 +1603,17 @@ 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 , wxChar uniChar )
+// 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 )

 {
 {

-    if ( !focus )
-        return false ;
-

     short keycode, keychar ;
 
     keychar = short(keymessage & charCodeMask);
     keycode = short(keymessage & keyCodeMask) >> 8 ;
     short keycode, keychar ;
 
     keychar = short(keymessage & charCodeMask);
     keycode = short(keymessage & keyCodeMask) >> 8 ;

-    if ( modifiers & (controlKey | shiftKey | optionKey) )
+    if ( !(event.GetEventType() == wxEVT_CHAR) && (modifiers & (controlKey | shiftKey | optionKey) ) )

     {
         // 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


@@ -1680,7 +1623,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     }
 
     long keyval = wxMacTranslateKey(keychar, keycode) ;
     }
 
     long keyval = wxMacTranslateKey(keychar, keycode) ;

-    if ( keyval == keychar )
+    if ( keyval == keychar && ( event.GetEventType() == wxEVT_KEY_UP || event.GetEventType() == wxEVT_KEY_DOWN ) )

         keyval = wxToupper( keyval ) ;
 
     // Check for NUMPAD keys
         keyval = wxToupper( keyval ) ;
 
     // Check for NUMPAD keys


@@ -1725,9 +1668,6 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
         } // end switch
     }
 
         } // end switch
     }
 

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

     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;


@@ -1743,7 +1683,4 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     event.m_y = wherey;
     event.SetTimestamp(when);
     event.SetEventObject(focus);
     event.m_y = wherey;
     event.SetTimestamp(when);
     event.SetEventObject(focus);

-    handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-
-    return handled ;

 }
 }