carbon cfm fixes

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

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 882781e7322c6c6fac4183b503f4b6bb33fc3cfa..896ede9fdb8c5d40ca36e661b354baa0518cc183 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -337,7 +337,8 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
                     break ;
             }
             break ;
-        case kEventMouseWheelMoved :
+     case kEventMouseWheelMoved :
+         {
             wxevent.SetEventType(wxEVT_MOUSEWHEEL ) ;
 
             // EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
@@ -347,6 +348,7 @@ static void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
             wxevent.m_wheelDelta = 1;
             wxevent.m_linesPerAction = 1;
             break ;
+         }
         default :
             wxevent.SetEventType(wxEVT_MOTION ) ;
             break ;
@@ -1000,17 +1002,17 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of 
     // the content view, so we have to retrieve it explicitely
     HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID , 
-        *m_peer ) ;
+        m_peer->GetControlRefAddr() ) ;
     if ( !m_peer->Ok() )
     {
         // compatibility mode fallback
-        GetRootControl( (WindowRef) m_macWindow , *m_peer ) ;
+        GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
     }
 #else
-    ::CreateRootControl( (WindowRef)m_macWindow , *m_peer ) ;
+    ::CreateRootControl( (WindowRef)m_macWindow , m_peer->GetControlRefAddr() ) ;
 #endif
     // the root control level handleer
-    MacInstallEventHandler() ;
+    MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
 
     // the frame window event handler
     InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;