fixing string param

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

diff --git a/src/mac/carbon/control.cpp b/src/mac/carbon/control.cpp
index 7dff26019ef71c8b8229ebc3a64dc4b213360cb7..f787ea9812d4227ae42c1fbd3a333826a45c2162 100644 (file)
--- a/src/mac/carbon/control.cpp
+++ b/src/mac/carbon/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/mac/carbon/control.cpp
 // Purpose:     wxControl class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,20 +12,24 @@
 #include "wx/wxprec.h"
 
 #include "wx/control.h"
-#include "wx/panel.h"
-#include "wx/app.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/panel.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/dialog.h"
+    #include "wx/scrolbar.h"
+    #include "wx/stattext.h"
+    #include "wx/statbox.h"
+    #include "wx/radiobox.h"
+    #include "wx/sizer.h"
+#endif // WX_PRECOMP
+
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
-#include "wx/radiobox.h"
 #include "wx/spinbutt.h"
-#include "wx/scrolbar.h"
-#include "wx/button.h"
-#include "wx/dialog.h"
-#include "wx/statbox.h"
-#include "wx/sizer.h"
-#include "wx/stattext.h"
 
 #include "wx/mac/uma.h"
 #include "wx/mac/private.h"
@@ -74,10 +78,10 @@ bool wxControl::ProcessCommand( wxCommandEvent &event )
     // Tries:
     // 1) OnCommand, starting at this window and working up parent hierarchy
     // 2) OnCommand then calls ProcessEvent to search the event tables.
-    return GetEventHandler()->ProcessEvent( event );
+    return HandleWindowEvent( event );
 }
 
-void  wxControl::OnKeyDown( wxKeyEvent &event )
+void  wxControl::OnKeyDown( wxKeyEvent &WXUNUSED(event) )
 {
     if ( m_peer == NULL || !m_peer->Ok() )
         return;
@@ -91,4 +95,3 @@ void  wxControl::OnKeyDown( wxKeyEvent &event )
 
     m_peer->HandleKey( keyCode, charCode, modifiers );
 }
-