X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2680ced12cbbed16990007c5fa3ea7730700122..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/control.cpp diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index 0389a007de..eff5294e5b 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: @@ -27,11 +27,6 @@ #include "wx/sizer.h" #endif // WX_PRECOMP -#include "wx/notebook.h" -#include "wx/tabctrl.h" -#include "wx/spinbutt.h" - -#include "wx/osx/uma.h" #include "wx/osx/private.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) @@ -68,11 +63,6 @@ bool wxControl::Create( wxWindow *parent, return rval; } -wxControl::~wxControl() -{ - m_isBeingDeleted = true; -} - bool wxControl::ProcessCommand( wxCommandEvent &event ) { // Tries: @@ -83,15 +73,19 @@ bool wxControl::ProcessCommand( wxCommandEvent &event ) void wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) ) { - if ( m_peer == NULL || !m_peer->IsOk() ) + if ( GetPeer() == NULL || !GetPeer()->IsOk() ) return; +#if wxOSX_USE_CARBON UInt32 keyCode, modifiers; char charCode; GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode ); - GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode ); + GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode ); GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers ); - m_peer->HandleKey( keyCode, charCode, modifiers ); + GetPeer()->HandleKey( keyCode, charCode, modifiers ); +#else + // TODO +#endif }