Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / carbon / control.cpp

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index dca650e0c8581f8becd0282ee7a74b07a43eb568..dba7a99689e242e6350078d57dfa260793c99e1a 100644 (file)
--- a/src/osx/carbon/control.cpp
+++ b/src/osx/carbon/control.cpp
@@ -27,10 +27,6 @@
     #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
     #include "wx/sizer.h"
 #endif // WX_PRECOMP
 

-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-#include "wx/spinbutt.h"
-

 #include "wx/osx/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 #include "wx/osx/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)


@@ -67,11 +63,6 @@ bool wxControl::Create( wxWindow *parent,
     return rval;
 }
 
     return rval;
 }
 

-wxControl::~wxControl()
-{
-    m_isBeingDeleted = true;
-}
-

 bool wxControl::ProcessCommand( wxCommandEvent &event )
 {
     // Tries:
 bool wxControl::ProcessCommand( wxCommandEvent &event )
 {
     // Tries:


@@ -82,7 +73,7 @@ bool wxControl::ProcessCommand( wxCommandEvent &event )
 
 void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {
 
 void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {

-    if ( m_peer == NULL || !m_peer->IsOk() )
+    if ( GetPeer() == NULL || !GetPeer()->IsOk() )

         return;
 
 #if wxOSX_USE_CARBON
         return;
 
 #if wxOSX_USE_CARBON


@@ -93,7 +84,7 @@ void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
 
     GetEventParameter( (EventRef)wxTheApp->MacGetCurrentEvent(), kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), 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
 #else
     // TODO
 #endif