fixed typo in prior checkin

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 680fad9f5d1de79995b3ab2a504321eecb0b6009..7116cf645fe9271df3943caedcb6ac4a07e09e7a 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 ;
                 {
 #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 ) ;
                     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 ) ;
 
 #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
 #endif

-

                     }
 
                     thisWindow->MacSetCGContextRef( cgContext ) ;
                     }
 
                     thisWindow->MacSetCGContextRef( cgContext ) ;


@@ -467,7 +467,7 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                 content[textSize - 1] = 0 ;
 
 #if wxUSE_UNICODE
                 content[textSize - 1] = 0 ;
 
 #if wxUSE_UNICODE

-                textCtrl->WriteText( wxString( content , wxConvLocal )  );
+                textCtrl->WriteText( wxString( content , wxConvLocal ) );

 #else
                 textCtrl->WriteText( wxString( content ) ) ;
 #endif
 #else
                 textCtrl->WriteText( wxString( content ) ) ;
 #endif


@@ -595,7 +595,7 @@ void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
     int x = 0 , y = 0;
     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;
     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 ) ;
     OffsetRgn( rgn , -x , -y ) ;
     wxMacWindowStateSaver sv( this ) ;
     SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;


@@ -847,11 +847,12 @@ void wxWindowMac::MacInstallEventHandler( WXWidget control )
 }
 
 // Constructor
 }
 
 // Constructor

-bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxWindowMac::Create(wxWindowMac *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name)

 {
     wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
 
 {
     wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
 


@@ -873,19 +874,19 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
             | kControlHandlesTracking
             | kControlSupportsFocus
             | kControlWantsActivate
             | kControlHandlesTracking
             | kControlSupportsFocus
             | kControlWantsActivate

-            | kControlWantsIdle
-            ;
+            | kControlWantsIdle ;

 
         m_peer = new wxMacControl(this) ;
 
         m_peer = new wxMacControl(this) ;

-        ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+        OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+        verify_noerr( err );

 
         MacPostControlCreate(pos, size) ;
     }
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
 
         MacPostControlCreate(pos, size) ;
     }
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them

-    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
-         (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
+    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+         || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))

     {
         MacCreateScrollBars( style ) ;
     }
     {
         MacCreateScrollBars( style ) ;
     }


@@ -909,8 +910,8 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 {
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 
 {
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 

-    m_peer->SetReference( (long) this ) ;
-    GetParent()->AddChild(this);
+    m_peer->SetReference( (long)this ) ;
+    GetParent()->AddChild( this );

 
     MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
 
 
     MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
 


@@ -999,7 +1000,7 @@ void wxWindowMac::MacUpdateControlFont()
 
 bool wxWindowMac::SetFont(const wxFont& font)
 {
 
 bool wxWindowMac::SetFont(const wxFont& font)
 {

-    bool retval = wxWindowBase::SetFont( font ) ;
+    bool retval = wxWindowBase::SetFont( font );

 
     MacUpdateControlFont() ;
 
 
     MacUpdateControlFont() ;
 


@@ -1008,10 +1009,10 @@ bool wxWindowMac::SetFont(const wxFont& font)
 
 bool wxWindowMac::SetForegroundColour(const wxColour& col )
 {
 
 bool wxWindowMac::SetForegroundColour(const wxColour& col )
 {

-    bool retval = wxWindowBase::SetForegroundColour(col);
+    bool retval = wxWindowBase::SetForegroundColour( col );

 
     if (retval)
 
     if (retval)

-        MacUpdateControlFont() ;
+        MacUpdateControlFont();

 
     return retval;
 }
 
     return retval;
 }


@@ -1023,15 +1024,15 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
 
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
 
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());

-    if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+
+    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) )

         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
         brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;

-    else if (  newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+    else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )

         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     else
         brush.SetColour( newCol ) ;
 
     MacSetBackgroundBrush( brush ) ;
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     else
         brush.SetColour( newCol ) ;
 
     MacSetBackgroundBrush( brush ) ;

-

     MacUpdateControlFont() ;
 
     return true ;
     MacUpdateControlFont() ;
 
     return true ;


@@ -1070,39 +1071,42 @@ void wxWindowMac::SetFocus()
     if ( err == errCouldntSetFocus )
         return ;
 
     if ( err == errCouldntSetFocus )
         return ;
 

-    // enable for patch 1376506 - perhaps? (Stefan's version)
-#if 1

     SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
     SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );

-#endif

 
 #if !TARGET_API_MAC_OSX
     // emulate carbon events when running under CarbonLib where they are not natively available
     if ( former )
     {
         EventRef evRef = NULL ;
 
 #if !TARGET_API_MAC_OSX
     // emulate carbon events when running under CarbonLib where they are not natively available
     if ( former )
     {
         EventRef evRef = NULL ;

-        verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
-            &evRef ) );
+
+        err = MacCreateEvent(
+            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+            kEventAttributeUserEvent , &evRef );
+        verify_noerr( err );

 
         wxMacCarbonEvent cEvent( evRef ) ;
         cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
         cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
 
         wxMacWindowEventHandler( NULL , evRef , former ) ;
 
         wxMacCarbonEvent cEvent( evRef ) ;
         cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
         cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
 
         wxMacWindowEventHandler( NULL , evRef , former ) ;

-        ReleaseEvent(evRef) ;
+        ReleaseEvent( evRef ) ;

     }
 
     // send new focus event
     {
         EventRef evRef = NULL ;
     }
 
     // send new focus event
     {
         EventRef evRef = NULL ;

-        verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
-            &evRef ) );
+
+        err = MacCreateEvent(
+            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+            kEventAttributeUserEvent , &evRef );
+        verify_noerr( err );

 
         wxMacCarbonEvent cEvent( evRef ) ;
         cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
         cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
 
         wxMacWindowEventHandler( NULL , evRef , this ) ;
 
         wxMacCarbonEvent cEvent( evRef ) ;
         cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
         cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
 
         wxMacWindowEventHandler( NULL , evRef , this ) ;

-        ReleaseEvent(evRef) ;
+        ReleaseEvent( evRef ) ;

     }
 #endif
 }
     }
 #endif
 }


@@ -1132,7 +1136,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != NULL )
     {
     m_dropTarget = pDropTarget;
     if ( m_dropTarget != NULL )
     {

-        // TODO
+        // TODO:

     }
 }
 
     }
 }
 


@@ -1141,7 +1145,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 // Old style file-manager drag&drop
 void wxWindowMac::DragAcceptFiles(bool accept)
 {
 // Old style file-manager drag&drop
 void wxWindowMac::DragAcceptFiles(bool accept)
 {

-    // TODO
+    // TODO:

 }
 
 // Returns the size of the native control. In the case of the toplevel window
 }
 
 // Returns the size of the native control. In the case of the toplevel window


@@ -1167,7 +1171,8 @@ bool wxWindowMac::MacGetBoundsForControl(
 
     x = (int)pos.x;
     y = (int)pos.y;
 
     x = (int)pos.x;
     y = (int)pos.y;

-    // todo the default calls may be used as soon as PostCreateControl Is moved here
+
+    // TODO: the default calls may be used as soon as PostCreateControl Is moved here

     w = wxMax(size.x, 0) ; // WidthDefault( size.x );
     h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
 
     w = wxMax(size.x, 0) ; // WidthDefault( size.x );
     h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
 


@@ -1243,24 +1248,21 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
 void wxWindowMac::DoScreenToClient(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;

+    wxCHECK_RET( window , wxT("TopLevel Window missing") ) ;

 
 

-    wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
-
-    {
-        Point localwhere = {0, 0} ;
+    Point localwhere = { 0, 0 } ;

 
 

-        if (x)
-            localwhere.h = *x ;
-        if (y)
-            localwhere.v = *y ;
+    if (x)
+        localwhere.h = *x ;
+    if (y)
+        localwhere.v = *y ;

 
 

-        QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;
+    QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;

 
 

-        if (x)
-           *x = localwhere.h ;
-        if (y)
-           *y = localwhere.v ;
-    }
+    if (x)
+       *x = localwhere.h ;
+    if (y)
+       *y = localwhere.v ;

 
     MacRootWindowToWindow( x , y ) ;
 
 
     MacRootWindowToWindow( x , y ) ;
 


@@ -1274,7 +1276,7 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
 void wxWindowMac::DoClientToScreen(int *x, int *y) const
 {
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
 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)
 
     wxPoint origin = GetClientAreaOrigin() ;
     if (x)


@@ -1284,20 +1286,18 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
 
     MacWindowToRootWindow( x , y ) ;
 
 
     MacWindowToRootWindow( x , y ) ;
 

-    {
-        Point localwhere = { 0,0 };
-        if (x)
-           localwhere.h = * x ;
-        if (y)
-           localwhere.v = * y ;
+    Point localwhere = { 0, 0 };
+    if (x)
+       localwhere.h = *x ;
+    if (y)
+       localwhere.v = *y ;

 
 

-        QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;
+    QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;

 
 

-        if (x)
-           *x = localwhere.h ;
-        if (y)
-           *y = localwhere.v ;
-    }
+    if (x)
+       *x = localwhere.h ;
+    if (y)
+       *y = localwhere.v ;

 }
 
 void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 }
 
 void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const


@@ -1325,6 +1325,7 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {
     wxPoint pt ;
 void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
 {
     wxPoint pt ;

+

     if (x)
         pt.x = *x ;
     if (y)
     if (x)
         pt.x = *x ;
     if (y)


@@ -1446,7 +1447,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) ;
         // 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 ) ;
     }
 
     DisposeRgn( rgn ) ;


@@ -1511,13 +1512,14 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
         CGrafPtr savePort ;
         Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
 
         CGrafPtr savePort ;
         Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
 

-        // TODO If we ever get a GetCurrentEvent.. replacement for the mouse
-        // position, use it...
+        // TODO: If we ever get a GetCurrentEvent... replacement
+        // for the mouse position, use it...

 
         Point pt ;
 
         Point pt ;

-        GetMouse( &pt ) ;

         ControlPartCode part ;
         ControlRef control ;
         ControlPartCode part ;
         ControlRef control ;

+
+        GetMouse( &pt ) ;

         control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ;
         if ( control )
             mouseWin = wxFindControlFromMacControl( control ) ;
         control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ;
         if ( control )
             mouseWin = wxFindControlFromMacControl( control ) ;


@@ -1557,7 +1559,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
         wxMenuItem* item = NULL ;
         wxMenu* realmenu ;
         GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
         wxMenuItem* item = NULL ;
         wxMenu* realmenu ;

-        item = menu->FindItem(id, &realmenu) ;
+        item = menu->FindItem( id, &realmenu ) ;

         if (item->IsCheckable())
             item->Check( !item->IsChecked() ) ;
 
         if (item->IsCheckable())
             item->Check( !item->IsChecked() ) ;
 


@@ -1565,7 +1567,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     }
 
     menu->MacAfterDisplay( true ) ;
     }
 
     menu->MacAfterDisplay( true ) ;

-    menu->SetInvokingWindow(NULL);
+    menu->SetInvokingWindow( NULL );

 
   return true;
 }
 
   return true;
 }


@@ -1606,11 +1608,13 @@ void wxWindowMac::MacInvalidateBorders()
     // now we know that we have something to do at all
 
     // as the borders are drawn on the parent we have to properly invalidate all these areas
     // now we know that we have something to do at all
 
     // as the borders are drawn on the parent we have to properly invalidate all these areas

-    RgnHandle   updateInner = NewRgn() ,
-                updateOuter = NewRgn() ;
+    RgnHandle updateInner , updateOuter;
+    Rect rect ;

 
     // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
 
     // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon

-    Rect rect ;
+    updateInner = NewRgn() ;
+    updateOuter = NewRgn() ;
+

     m_peer->GetRect( &rect ) ;
     RectRgn( updateInner, &rect ) ;
     InsetRect( &rect , -outerBorder , -outerBorder ) ;
     m_peer->GetRect( &rect ) ;
     RectRgn( updateInner, &rect ) ;
     InsetRect( &rect , -outerBorder , -outerBorder ) ;


@@ -1625,104 +1629,8 @@ void wxWindowMac::MacInvalidateBorders()
         InvalWindowRgn( tlw , updateOuter ) ;
 #endif
 
         InvalWindowRgn( tlw , updateOuter ) ;
 #endif
 

-    DisposeRgn(updateOuter) ;
-    DisposeRgn(updateInner) ;
-
-#if 0
-    RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ;
-    RectRgn( updateInner , &rect ) ;
-    InsetRect( &rect , -4 , -4 ) ;
-    RectRgn( updateOuter , &rect ) ;
-    DiffRgn( updateOuter , updateInner , updateOuter ) ;
-    wxPoint parent(0, 0);
-    GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
-    parent -= GetParent()->GetClientAreaOrigin() ;
-    OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
-    GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ;
-    DisposeRgn(updateOuter) ;
-    DisposeRgn(updateInner) ;
-#endif
-
-#if 0
-    if ( m_peer )
-    {
-        // deleting a window while it is shown invalidates the region occupied by border or
-        // focus
-
-        if ( IsShown() && ( outerBorder > 0 ) )
-        {
-            // as the borders are drawn on the parent we have to properly invalidate all these areas
-            RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
-
-            Rect rect ;
-
-            m_peer->GetRect( &rect ) ;
-            RectRgn( updateInner , &rect ) ;
-            InsetRect( &rect , -outerBorder , -outerBorder ) ;
-            RectRgn( updateOuter , &rect ) ;
-            DiffRgn( updateOuter , updateInner ,updateOuter ) ;
-            wxPoint parent(0, 0);
-            GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
-            parent -= GetParent()->GetClientAreaOrigin() ;
-            OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
-            CopyRgn( updateOuter , updateTotal ) ;
-
-            GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
-            DisposeRgn(updateOuter) ;
-            DisposeRgn(updateInner) ;
-            DisposeRgn(updateTotal) ;
-        }
-    }
-#endif
-
-#if 0
-    Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
-
-    int outerBorder = MacGetLeftBorderSize() ;
-    if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
-        outerBorder += 4 ;
-
-    if ( vis && ( outerBorder > 0 ) )
-    {
-        // as the borders are drawn on the parent we have to properly invalidate all these areas
-        RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
-
-        Rect rect ;
-
-        m_peer->GetRect( &rect ) ;
-        RectRgn( updateInner , &rect ) ;
-        InsetRect( &rect , -outerBorder , -outerBorder ) ;
-        RectRgn( updateOuter , &rect ) ;
-        DiffRgn( updateOuter , updateInner ,updateOuter ) ;
-
-        /*
-        wxPoint parent(0, 0);
-#if TARGET_API_MAC_OSX
-        // no offsetting needed when compositing
-#else
-        GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
-        parent -= GetParent()->GetClientAreaOrigin() ;
-        OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
-#endif
-        */
-        CopyRgn( updateOuter , updateTotal ) ;
-
-        rect = r ;
-        RectRgn( updateInner , &rect ) ;
-        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) ;
-    }
-#endif
+    DisposeRgn( updateOuter ) ;
+    DisposeRgn( updateInner ) ;

 }
 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)


@@ -1874,12 +1782,15 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         return;
     }
 
         return;
     }
 

-    if ( x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        x = currentX;
-    if ( y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
-        y = currentY;
+    if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    {
+        if ( x == wxDefaultCoord )
+            x = currentX;
+        if ( y == wxDefaultCoord )
+            y = currentY;
+    }

 
 

-    AdjustForParentClientOrigin(x, y, sizeFlags);
+    AdjustForParentClientOrigin( x, y, sizeFlags );

 
     wxSize size = wxDefaultSize;
     if ( width == wxDefaultCoord )
 
     wxSize size = wxDefaultSize;
     if ( width == wxDefaultCoord )


@@ -1913,7 +1824,7 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    DoMoveWindow(x, y, width, height);
+    DoMoveWindow( x, y, width, height );

 }
 
 wxPoint wxWindowMac::GetClientAreaOrigin() const
 }
 
 wxPoint wxWindowMac::GetClientAreaOrigin() const


@@ -1971,20 +1882,13 @@ bool wxWindowMac::Show(bool show)
     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( !wxWindowBase::Show(show) )
         return false;
 

-    // TODO use visibilityChanged Carbon Event for OSX
+    // TODO: use visibilityChanged Carbon Event for OSX

     if ( m_peer )
         m_peer->SetVisibility( show , true ) ;
 
     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
 
     if ( m_peer )
         m_peer->SetVisibility( show , true ) ;
 
     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
 

-#if 1
-    // patch from Sailesh Agrawal
-    wxShowEvent eventShow(GetId(), show);
-    eventShow.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(eventShow);
-#endif
-

     return true;
 }
 
     return true;
 }
 


@@ -2322,8 +2226,8 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
     bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
     bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ;
 
     bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
     bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ;
 

-    m_peer->GetRect( &rect ) ;

     // back to the surrounding frame rectangle
     // back to the surrounding frame rectangle

+    m_peer->GetRect( &rect ) ;

     InsetRect( &rect, -1 , -1 ) ;
 
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     InsetRect( &rect, -1 , -1 ) ;
 
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3


@@ -2333,7 +2237,7 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
             rect.bottom - rect.top ) ;
 
         HIThemeFrameDrawInfo info ;
             rect.bottom - rect.top ) ;
 
         HIThemeFrameDrawInfo info ;

-        memset( &info, 0 , sizeof( info ) ) ;
+        memset( &info, 0 , sizeof(info) ) ;

 
         info.version = 0 ;
         info.kind = 0 ;
 
         info.version = 0 ;
         info.kind = 0 ;


@@ -2415,20 +2319,15 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {

+    bool showScroller;
+

     if ( orient == wxHORIZONTAL )
     {
         if ( m_hScrollBar )
         {
     if ( orient == wxHORIZONTAL )
     {
         if ( m_hScrollBar )
         {

-            if ( range == 0 || thumbVisible >= range )
-            {
-                if ( m_hScrollBar->IsShown() )
-                    m_hScrollBar->Show(false) ;
-            }
-            else
-            {
-                if ( !m_hScrollBar->IsShown() )
-                    m_hScrollBar->Show(true) ;
-            }
+            showScroller = ((range != 0) && (range > thumbVisible));
+            if ( m_hScrollBar->IsShown() != showScroller )
+                m_hScrollBar->Show( showScroller ) ;

 
             m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }
 
             m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }


@@ -2437,16 +2336,9 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     {
         if ( m_vScrollBar )
         {
     {
         if ( m_vScrollBar )
         {

-            if ( range == 0 || thumbVisible >= range )
-            {
-                if ( m_vScrollBar->IsShown() )
-                    m_vScrollBar->Show(false) ;
-            }
-            else
-            {
-                if ( !m_vScrollBar->IsShown() )
-                    m_vScrollBar->Show(true) ;
-            }
+            showScroller = ((range != 0) && (range > thumbVisible));
+            if ( m_vScrollBar->IsShown() != showScroller )
+                m_vScrollBar->Show( showScroller ) ;

 
             m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }
 
             m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
         }


@@ -2469,14 +2361,14 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
     {
         // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
         // area is scrolled, this does not occur if width and height are 2 pixels less,
     {
         // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
         // area is scrolled, this does not occur if width and height are 2 pixels less,

-        // TODO write optimal workaround
+        // TODO: write optimal workaround

         wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
         if ( rect )
             scrollrect.Intersect( *rect ) ;
 
         if ( m_peer->GetNeedsDisplay() )
         {
         wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
         if ( rect )
             scrollrect.Intersect( *rect ) ;
 
         if ( m_peer->GetNeedsDisplay() )
         {

-            // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
+            // because HIViewScrollRect does not scroll the already invalidated area we have two options:

             // either immediate redraw or full invalidate
 #if 1
             // is the better overall solution, as it does not slow down scrolling
             // either immediate redraw or full invalidate
 #if 1
             // is the better overall solution, as it does not slow down scrolling


@@ -2649,16 +2541,6 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 
     //wxChildFocusEvent eventFocus(this);
     //(void)GetEventHandler()->ProcessEvent(eventFocus);
 

-    bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
-
-    // 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
     if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
     {
 #if wxMAC_USE_CORE_GRAPHICS


@@ -2682,6 +2564,7 @@ void wxWindowMac::OnSetFocus( wxFocusEvent& event )
             rect.bottom += pt.y ;
         }
 
             rect.bottom += pt.y ;
         }
 

+        bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);

         DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
         if ( !bIsFocusEvent )
         {
         DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
         if ( !bIsFocusEvent )
         {


@@ -3066,8 +2949,8 @@ void wxWindowMac::MacCreateScrollBars( long style )
 
         wxPoint vPoint(width - scrlsize, 0) ;
         wxSize vSize(scrlsize, height - adjust) ;
 
         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);
 
         if ( style & wxVSCROLL )
             m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);


@@ -3083,10 +2966,9 @@ void wxWindowMac::MacCreateScrollBars( long style )
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
 {
 
 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()
 }
 
 void wxWindowMac::MacRepositionScrollBars()


@@ -3206,13 +3088,15 @@ long wxWindowMac::MacGetLeftBorderSize() const
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
     {
 
     if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
     {

+        // this metric is only the 'outset' outside the simple frame rect

         GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
         GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;

-        border += 1 ; // the metric above is only the 'outset' outside the simple frame rect
+        border += 1 ;

     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {
     }
     else if (HasFlag(wxSIMPLE_BORDER))
     {

+        // this metric is only the 'outset' outside the simple frame rect

         GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
         GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;

-        border += 1 ; // the metric above is only the 'outset' outside the simple frame rect
+        border += 1 ;

     }
 
     return border ;
     }
 
     return border ;


@@ -3263,11 +3147,11 @@ wxPoint wxGetMousePosition()
 
 void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 {
 
 void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 {

-    long evtType = event.GetEventType();
-//    if ((evtType == ewxEVT_RIGHT_DOWN) || (evtType == wxEVT_CONTEXT_MENU))

     if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
     {
         // copied from wxGTK : CS
     if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
     {
         // copied from wxGTK : CS

+        // VZ: shouldn't we move this to base class then?
+

         // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
         // except that:
         //
         // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
         // except that:
         //


@@ -3302,8 +3186,8 @@ Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxS
 {
     int x, y, w, h ;
 
 {
     int x, y, w, h ;
 

-    window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ;
-    Rect bounds =  { y, x, y + h, x + w };
+    window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+    Rect bounds = { y, x, y + h, x + w };

 
     return bounds ;
 }
 
     return bounds ;
 }


@@ -3316,7 +3200,6 @@ wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
 bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
 {
     wxWindowMac *newParent = (wxWindowMac *)newParentBase;
 bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
 {
     wxWindowMac *newParent = (wxWindowMac *)newParentBase;

-

     if ( !wxWindowBase::Reparent(newParent) )
         return false;
 
     if ( !wxWindowBase::Reparent(newParent) )
         return false;