X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0c8f31f407ecfce909060464c0ea655221cdab..472137baebae6c011ad7d70285de454b9ce7796d:/src/osx/carbon/control.cpp diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index e8874e6a8c..dca650e0c8 100644 --- a/src/osx/carbon/control.cpp +++ b/src/osx/carbon/control.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/control.cpp +// Name: src/osx/carbon/control.cpp // Purpose: wxControl class // Author: Stefan Csomor // Modified by: @@ -31,7 +31,6 @@ #include "wx/tabctrl.h" #include "wx/spinbutt.h" -#include "wx/osx/uma.h" #include "wx/osx/private.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) @@ -83,9 +82,10 @@ bool wxControl::ProcessCommand( wxCommandEvent &event ) void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) { - if ( m_peer == NULL || !m_peer->Ok() ) + if ( m_peer == NULL || !m_peer->IsOk() ) return; +#if wxOSX_USE_CARBON UInt32 keyCode, modifiers; char charCode; @@ -94,4 +94,7 @@ void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); m_peer->HandleKey( keyCode, charCode, modifiers ); +#else + // TODO +#endif }