Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index f787ea9812d4227ae42c1fbd3a333826a45c2162..7f406f3a8bf86d4bc62b931d34f7654c8b4873bf 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:
@@ -27,12 +27,7 @@
     #include "wx/sizer.h"
 #endif // WX_PRECOMP
 
-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-#include "wx/spinbutt.h"
-
-#include "wx/mac/uma.h"
-#include "wx/mac/private.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,9 +73,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 +85,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
 }