compilation fix after NULL cast removal; also used it to get rid of an ugly OnTimerEv...

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

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index 2a2db6407cfe57b051ffc97026cc39d931a6f3f8..392c061792913a3998e1db093112b643d710d20b 100644 (file)
--- a/src/osx/carbon/window.cpp
+++ b/src/osx/carbon/window.cpp
@@ -287,8 +287,8 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                         thisWindow->GetCaret()->OnKillFocus();
 #endif
 
                         thisWindow->GetCaret()->OnKillFocus();
 #endif
 

-                    wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
-
+                    wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
+                    

                     // remove this as soon as posting the synthesized event works properly
                     static bool inKillFocusEvent = false ;
 
                     // remove this as soon as posting the synthesized event works properly
                     static bool inKillFocusEvent = false ;
 


@@ -307,7 +307,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 {
                     // set focus
                     // panel wants to track the window which was the last to have focus in it
                 {
                     // set focus
                     // panel wants to track the window which was the last to have focus in it

-                    wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+                    wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));

                     wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
                     thisWindow->HandleWindowEvent(eventFocus);
 
                     wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
                     thisWindow->HandleWindowEvent(eventFocus);
 


@@ -335,12 +335,12 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 if ( controlPart != kControlFocusNoPart )
                 {
                     targetFocusWindow = thisWindow;
                 if ( controlPart != kControlFocusNoPart )
                 {
                     targetFocusWindow = thisWindow;

-                    wxLogTrace(_T("Focus"), _T("focus to be set(%p)"), wx_static_cast(void*, thisWindow));
+                    wxLogTrace(_T("Focus"), _T("focus to be set(%p)"), static_cast<void*>(thisWindow));

                 }
                 else
                 {
                     formerFocusWindow = thisWindow;
                 }
                 else
                 {
                     formerFocusWindow = thisWindow;

-                    wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), wx_static_cast(void*, thisWindow));
+                    wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), static_cast<void*>(thisWindow));

                 }
                 
                 ControlPartCode previousControlPart = 0;
                 }
                 
                 ControlPartCode previousControlPart = 0;


@@ -393,7 +393,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                             thisWindow->GetCaret()->OnKillFocus();
 #endif
 
                             thisWindow->GetCaret()->OnKillFocus();
 #endif
 

-                        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+                        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));

 
                         static bool inKillFocusEvent = false ;
 
 
                         static bool inKillFocusEvent = false ;
 


@@ -409,7 +409,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     else
                     {
                         // panel wants to track the window which was the last to have focus in it
                     else
                     {
                         // panel wants to track the window which was the last to have focus in it

-                        wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+                        wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));

                         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
                         thisWindow->HandleWindowEvent(eventFocus);
 
                         wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
                         thisWindow->HandleWindowEvent(eventFocus);
 


@@ -849,7 +849,7 @@ void wxMacControl::RemoveFromParent()
 
 void wxMacControl::Embed( wxWidgetImpl *parent )
 {
 
 void wxMacControl::Embed( wxWidgetImpl *parent )
 {

-    HIViewAddSubview(parent->GetWXWidget(), m_controlRef);
+    HIViewAddSubview((ControlRef)parent->GetWXWidget(), m_controlRef);

 }
 
 void wxMacControl::SetNeedsDisplay( const wxRect* rect )
 }
 
 void wxMacControl::SetNeedsDisplay( const wxRect* rect )


@@ -1038,6 +1038,47 @@ bool wxMacControl::HasFocus() const
     return control == m_controlRef;
 }
 
     return control == m_controlRef;
 }
 

+void wxMacControl::SetCursor(const wxCursor& cursor)
+{
+    wxWindowMac *mouseWin = 0 ;
+    WindowRef window = GetControlOwner( m_controlRef ) ;
+
+    wxNonOwnedWindow* tlwwx = wxNonOwnedWindow::GetFromWXWindow( (WXWindow) window ) ;
+    if ( tlwwx != NULL )
+    {
+        ControlPartCode part ;
+        ControlRef control ;
+        Point pt ;
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+        HIPoint hiPoint ;
+        HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
+        pt.h = hiPoint.x;
+        pt.v = hiPoint.y;
+#else
+        GetGlobalMouse( &pt );
+        int x = pt.h;
+        int y = pt.v;
+        tlwwx->ScreenToClient(&x, &y);
+        pt.h = x;
+        pt.v = y;
+#endif
+        control = FindControlUnderMouse( pt , window , &part ) ;
+        if ( control )
+            mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
+    }
+
+    if ( mouseWin == tlwwx && !wxIsBusy() )
+        cursor.MacInstall() ;
+}
+
+void wxMacControl::CaptureMouse()
+{
+}
+
+void wxMacControl::ReleaseMouse()
+{
+}
+

 //
 // subclass specifics
 //
 //
 // subclass specifics
 //


@@ -1381,13 +1422,6 @@ void wxMacControl::SetScrollThumb( wxInt32 WXUNUSED(pos), wxInt32 WXUNUSED(views
     // implemented in respective subclass
 }
 
     // implemented in respective subclass
 }
 

-void wxMacControl::AddSubWidget( wxWidgetImpl* widget )
-{
-    ControlRef container = (ControlRef) GetWXWidget() ;
-    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
-    ::EmbedControl( (ControlRef) widget->GetWXWidget() , container ) ;
-}
-

 //
 // Tab Control
 //
 //
 // Tab Control
 //