ported KO's v262 change forward

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 8cf322afc2eb26aef5ffde5ae1b77c3800624406..dd032f43a58aca9671258d4d828ea66c8b2353f1 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -265,7 +265,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 {
 #if wxMAC_USE_CORE_GRAPHICS
                     bool created = false ;
-                    CGContextRef cgContext = 0 ;
+                    CGContextRef cgContext = NULL ;
                     if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
                     {
                         wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;
@@ -292,11 +292,11 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
 #if 0
                         CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;
-                        CGContextFillRect(cgContext , CGRectMake( 0 , 0 ,
-                            controlBounds.right - controlBounds.left ,
-                            controlBounds.bottom - controlBounds.top ) );
+                        CGContextFillRect( cgContext ,
+                            CGRectMake( 0 , 0 ,
+                                controlBounds.right - controlBounds.left ,
+                                controlBounds.bottom - controlBounds.top ) );
 #endif
-
                     }
 
                     thisWindow->MacSetCGContextRef( cgContext ) ;
@@ -595,7 +595,7 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
     int x = 0 , y = 0;
     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;
-    MacWindowToRootWindow( &x,&y ) ;
+    MacWindowToRootWindow( &x, &y ) ;
     OffsetRgn( rgn , -x , -y ) ;
     wxMacWindowStateSaver sv( this ) ;
     SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;
@@ -1070,10 +1070,7 @@ void wxWindowMac::SetFocus()
     if ( err == errCouldntSetFocus )
         return ;
 
-    // enable for patch 1376506 - perhaps? (Stefan's version)
-#if 1
     SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
-#endif
 
 #if !TARGET_API_MAC_OSX
     // emulate carbon events when running under CarbonLib where they are not natively available
@@ -1274,7 +1271,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
-    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+    wxCHECK_RET( window , wxT("TopLevel window missing") ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;
     if (x)
@@ -1285,7 +1282,7 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
     MacWindowToRootWindow( x , y ) ;
 
     {
-        Point localwhere = { 0,0 };
+        Point localwhere = { 0, 0 };
         if (x)
            localwhere.h = * x ;
         if (y)
@@ -1446,7 +1443,7 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
         // structure is in parent coordinates, but we only need width and height, so it's ok
 
         sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
-        sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ;
+        sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ;
     }
 
     DisposeRgn( rgn ) ;
@@ -1565,7 +1562,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     }
 
     menu->MacAfterDisplay( true ) ;
-    menu->SetInvokingWindow(NULL);
+    menu->SetInvokingWindow( NULL );
 
   return true;
 }
@@ -1646,8 +1643,8 @@ void wxWindowMac::MacInvalidateBorders()
 #if 0
     if ( m_peer )
     {
-        // deleting a window while it is shown invalidates the region occupied by border or
-        // focus
+        // deleting a window while it is shown invalidates
+        // the region occupied by border or focus
 
         if ( IsShown() && ( outerBorder > 0 ) )
         {
@@ -1695,7 +1692,7 @@ void wxWindowMac::MacInvalidateBorders()
         RectRgn( updateOuter , &rect ) ;
         DiffRgn( updateOuter , updateInner ,updateOuter ) ;
 
-        /*
+/*
         wxPoint parent(0, 0);
 #if TARGET_API_MAC_OSX
         // no offsetting needed when compositing
@@ -1704,7 +1701,8 @@ void wxWindowMac::MacInvalidateBorders()
         parent -= GetParent()->GetClientAreaOrigin() ;
         OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
 #endif
-        */
+*/
+
         CopyRgn( updateOuter , updateTotal ) ;
 
         rect = r ;
@@ -1712,15 +1710,17 @@ void wxWindowMac::MacInvalidateBorders()
         InsetRect( &rect , -outerBorder , -outerBorder ) ;
         RectRgn( updateOuter , &rect ) ;
         DiffRgn( updateOuter , updateInner , updateOuter ) ;
+
 /*
         OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
 */
+
         UnionRgn( updateOuter , updateTotal , updateTotal ) ;
 
         GetParent()->m_peer->SetNeedsDisplay( updateTotal  ) ;
-        DisposeRgn(updateOuter) ;
-        DisposeRgn(updateInner) ;
-        DisposeRgn(updateTotal) ;
+        DisposeRgn( updateOuter ) ;
+        DisposeRgn( updateInner ) ;
+        DisposeRgn( updateTotal ) ;
     }
 #endif
 }
@@ -2649,18 +2649,6 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
-#if !wxMAC_USE_CORE_GRAPHICS
-    bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
-#endif
-
-    // enable for patch 1376506 - perhaps?
-#if 0
-    if ( bIsFocusEvent )
-          SetUserFocusWindow( GetControlOwner( GetPeer()->GetControlRef() ) );
-    else
-          SetUserFocusWindow( kUserFocusAuto );
-#endif
-
     if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
     {
 #if wxMAC_USE_CORE_GRAPHICS
@@ -2684,6 +2672,7 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
             rect.bottom += pt.y ;
         }
 
+        bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
         DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
         if ( !bIsFocusEvent )
         {
@@ -3068,8 +3057,8 @@ void wxWindowMac::MacCreateScrollBars( long style )
 
         wxPoint vPoint(width - scrlsize, 0) ;
         wxSize vSize(scrlsize, height - adjust) ;
-        wxPoint hPoint(0 , height - scrlsize ) ;
-        wxSize hSize( width - adjust, scrlsize) ;
+        wxPoint hPoint(0, height - scrlsize) ;
+        wxSize hSize(width - adjust, scrlsize) ;
 
         if ( style & wxVSCROLL )
             m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);
@@ -3085,10 +3074,9 @@ void wxWindowMac::MacCreateScrollBars( long style )
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
 {
-    if ( child != NULL && ( child == m_hScrollBar || child == m_vScrollBar ) )
-        return false ;
-    else
-        return true ;
+    bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+
+    return result ;
 }
 
 void wxWindowMac::MacRepositionScrollBars()
@@ -3208,13 +3196,15 @@ long wxWindowMac::MacGetLeftBorderSize() const
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
     {
+        // this metric is only the 'outset' outside the simple frame rect
         GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
-        border += 1 ; // the metric above is only the 'outset' outside the simple frame rect
+        border += 1 ;
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
+        // this metric is only the 'outset' outside the simple frame rect
         GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-        border += 1 ; // the metric above is only the 'outset' outside the simple frame rect
+        border += 1 ;
     }
 
     return border ;