/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/mac/carbon/app.cpp
// Purpose: wxApp
// Author: Stefan Csomor
// Modified by:
#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"
+
+#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"
+#endif
+
#include "wx/module.h"
-#include "wx/memory.h"
#include "wx/tooltip.h"
-#include "wx/textctrl.h"
-#include "wx/menu.h"
#include "wx/docview.h"
#include "wx/filename.h"
# include <Devices.h>
#endif
-extern wxList wxPendingDelete;
-
#if wxUSE_THREADS
extern size_t g_numberOfThreads;
#endif
int wxId ;
} ;
-IdPair gCommandIds [] =
+IdPair gCommandIds [] =
{
{ kHICommandCut , wxID_CUT } ,
{ kHICommandCopy , wxID_COPY } ,
{ kHICommandRedo , wxID_REDO } ,
} ;
-int wxMacCommandToId( UInt32 macCommandId )
+int wxMacCommandToId( UInt32 macCommandId )
{
int wxid = 0 ;
-
+
switch ( macCommandId )
{
case kHICommandPreferences :
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)
return macId ;
}
-wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
+wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
{
wxMenu* itemMenu = NULL ;
int id = 0 ;
if ( item )
{
wxASSERT( itemMenu != NULL ) ;
-
+
switch ( cEvent.GetKind() )
{
case kEventProcessCommand :
{
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 )
processed = win->GetEventHandler()->ProcessEvent(event);
break;
}
-
+
menu = menu->GetParent();
}
}
-
+
if ( processed )
{
// if anything changed, update the changed attribute
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,
switch (status)
{
- case eventLoopTimedOutErr :
+ case eventLoopTimedOutErr :
if ( wxTheApp->ProcessIdle() )
sleepTime = kEventDurationNoWait ;
else
sleepTime = kEventDurationSecond;
break;
- case eventLoopQuitErr :
+ case eventLoopQuitErr :
// according to QA1061 this may also occur
// when a WakeUp Process is executed
break;
#endif // wxUSE_THREADS
}
-long wxMacTranslateKey(unsigned char key, unsigned char code) ;
long wxMacTranslateKey(unsigned char key, unsigned char code)
{
long retval = key ;
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 );
-
+#else
+ ms.SetLeftDown( Button() );
+ ms.SetMiddleDown( 0 );
+ ms.SetRightDown( 0 );
+#endif
+
UInt32 modifiers = GetCurrentKeyModifiers();
ms.SetControlDown(modifiers & controlKey);
ms.SetShiftDown(modifiers & shiftKey);
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 ;
- 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;
+ bool handled;
+ wxKeyEvent event(wxEVT_KEY_DOWN) ;
+ MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
- 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
- }
-
- 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 ;
}
#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 )
{
+ event.SetEventType( wxEVT_CHAR );
event.Skip( false ) ;
- event.SetEventType( wxEVT_CHAR ) ;
-
- // raw value again
- event.m_keyCode = realkeyval ;
-
handled = focus->GetEventHandler()->ProcessEvent( event ) ;
- if ( handled && event.GetSkipped() )
- handled = false ;
}
if ( !handled && (keyval == WXK_TAB) )
}
}
}
-
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 ;
- 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
}
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
} // 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_y = wherey;
event.SetTimestamp(when);
event.SetEventObject(focus);
- handled = focus->GetEventHandler()->ProcessEvent( event ) ;
-
- return handled ;
}
projects / wxWidgets.git / blobdiff