Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

classic fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-13 14:06:08 +00:00
parent e802b32a26
commit d16477fd75
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/app.cpp
View File

@@ -1008,7 +1008,9 @@ wxApp::wxApp()
m_auto3D = TRUE; m_auto3D = TRUE;
m_macCurrentEvent = NULL ; m_macCurrentEvent = NULL ;
#if TARGET_CARBON
m_macCurrentEventHandlerCallRef = NULL ; m_macCurrentEventHandlerCallRef = NULL ;
#endif
} }
bool wxApp::Initialized() bool wxApp::Initialized()
@@ -1395,7 +1397,7 @@ void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
focus->GetEventHandler()->ProcessEvent( event ) ; focus->GetEventHandler()->ProcessEvent( event ) ;
} }
if ( ev->modifiers ^ s_lastModifiers ) & cmdKey ) if ( ( ev->modifiers ^ s_lastModifiers ) & cmdKey )
{ {
event.m_keyCode = WXK_COMMAND ; event.m_keyCode = WXK_COMMAND ;
event.SetEventType( ( ev->modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( ev->modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

4
src/mac/carbon/app.cpp
View File

@@ -1008,7 +1008,9 @@ wxApp::wxApp()
m_auto3D = TRUE; m_auto3D = TRUE;
m_macCurrentEvent = NULL ; m_macCurrentEvent = NULL ;
#if TARGET_CARBON
m_macCurrentEventHandlerCallRef = NULL ; m_macCurrentEventHandlerCallRef = NULL ;
#endif
} }
bool wxApp::Initialized() bool wxApp::Initialized()
@@ -1395,7 +1397,7 @@ void wxApp::MacHandleModifierEvents( WXEVENTREF evr )
event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( ev->modifiers & optionKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;
focus->GetEventHandler()->ProcessEvent( event ) ; focus->GetEventHandler()->ProcessEvent( event ) ;
} }
if ( ev->modifiers ^ s_lastModifiers ) & cmdKey ) if ( ( ev->modifiers ^ s_lastModifiers ) & cmdKey )
{ {
event.m_keyCode = WXK_COMMAND ; event.m_keyCode = WXK_COMMAND ;
event.SetEventType( ( ev->modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ; event.SetEventType( ( ev->modifiers & cmdKey ) ? wxEVT_KEY_DOWN : wxEVT_KEY_UP ) ;

10
src/mac/carbon/textctrl.cpp
View File

@@ -1636,7 +1636,6 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
if ( m_macUsesTXN && wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) if ( m_macUsesTXN && wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
else else
#endif
{ {
EventRecord rec ; EventRecord rec ;
if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ) if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
@@ -1650,6 +1649,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ; ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
} }
} }
#else
EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
short keycode ;
short keychar ;
keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ;
::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
#endif
} }
if ( ( key >= 0x20 && key < WXK_START ) || if ( ( key >= 0x20 && key < WXK_START ) ||
key == WXK_RETURN || key == WXK_RETURN ||

10
src/mac/textctrl.cpp
View File

@@ -1636,7 +1636,6 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
if ( m_macUsesTXN && wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL ) if ( m_macUsesTXN && wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ; CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
else else
#endif
{ {
EventRecord rec ; EventRecord rec ;
if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ) if ( wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) )
@@ -1650,6 +1649,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ; ::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
} }
} }
#else
EventRecord *ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
short keycode ;
short keychar ;
keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ;
::HandleControlKey( (ControlHandle) m_macControl , keycode , keychar , ev->modifiers ) ;
#endif
} }
if ( ( key >= 0x20 && key < WXK_START ) || if ( ( key >= 0x20 && key < WXK_START ) ||
key == WXK_RETURN || key == WXK_RETURN ||