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 0389a007ded81d30811239656193a47d6fd6a235..dba7a99689e242e6350078d57dfa260793c99e1a 100644 (file)
--- 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:
 // Purpose:     wxControl class
 // Author:      Stefan Csomor
 // Modified by:


@@ -27,11 +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/uma.h"

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


@@ -68,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:


@@ -83,9 +73,10 @@ 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;
 
         return;
 

+#if wxOSX_USE_CARBON

     UInt32 keyCode, modifiers;
     char charCode;
 
     UInt32 keyCode, modifiers;
     char charCode;
 


@@ -93,5 +84,8 @@ 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

 }
 }