Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index ea45c04b31060f794a22ee78ff08d9e66b106b6c..306d8147d612e54cd12071a357964bb071a590bc 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        windows.cpp
+// Name:        src/mac/carbon/window.cpp

 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxWindowMac
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "window.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/menu.h"
 #include "wx/wxprec.h"
 
 #include "wx/menu.h"


@@ -43,7 +39,7 @@
 
 #if wxUSE_CARET
     #include "wx/caret.h"
 
 #if wxUSE_CARET
     #include "wx/caret.h"

-#endif // wxUSE_CARET
+#endif

 
 #define MAC_SCROLLBAR_SIZE 15
 #define MAC_SMALL_SCROLLBAR_SIZE 11
 
 #define MAC_SCROLLBAR_SIZE 15
 #define MAC_SMALL_SCROLLBAR_SIZE 11


@@ -76,8 +72,6 @@ extern wxList wxPendingDelete;
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif // __WXUNIVERSAL__/__WXMAC__
 
     IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
 #endif // __WXUNIVERSAL__/__WXMAC__
 

-#if !USE_SHARED_LIBRARY
-

 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_NC_PAINT(wxWindowMac::OnNcPaint)
     EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)


@@ -89,8 +83,6 @@ BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 

-#endif
-

 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
 #define wxMAC_DEBUG_REDRAW 0
 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
 #define wxMAC_DEBUG_REDRAW 0


@@ -145,7 +137,6 @@ void wxMacWindowToNative( const wxWindow* window , Rect *rect )
     OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
 }
 
     OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
 }
 

-

 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Carbon Events
 // ---------------------------------------------------------------------------


@@ -205,15 +196,11 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 if ( thisWindow->GetPeer()->IsCompositing() == false )
                 {
                     if ( thisWindow->GetPeer()->IsRootControl() == false )
                 if ( thisWindow->GetPeer()->IsCompositing() == false )
                 {
                     if ( thisWindow->GetPeer()->IsRootControl() == false )

-                    {

                         GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;
                         GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;

-                    }

                     else
                     else

-                    {

                         thisWindow->GetPeer()->GetRect( &controlBounds ) ;
                         thisWindow->GetPeer()->GetRect( &controlBounds ) ;

-                    }

                 }
                 }

-                
+

                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {
                     updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;


@@ -222,22 +209,12 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 {
                     if ( thisWindow->GetPeer()->IsCompositing() == false )
                     {
                 {
                     if ( thisWindow->GetPeer()->IsCompositing() == false )
                     {

-/*
-                        if ( thisWindow->GetPeer()->IsRootControl() == false )
-                        {
-                            GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;
-                        }
-                        else
-                        {
-                            thisWindow->GetPeer()->GetRect( &controlBounds ) ;
-                        }
-*/ 

                         allocatedRgn = NewRgn() ;
                         CopyRgn( updateRgn , allocatedRgn ) ;
                         OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ;
                         // hide the given region by the new region that must be shifted
                         wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
                         allocatedRgn = NewRgn() ;
                         CopyRgn( updateRgn , allocatedRgn ) ;
                         OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ;
                         // hide the given region by the new region that must be shifted
                         wxMacNativeToWindow( thisWindow , allocatedRgn ) ;

-                        updateRgn = allocatedRgn ;                            
+                        updateRgn = allocatedRgn ;

                     }
                     else
                     {
                     }
                     else
                     {


@@ -252,6 +229,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                         }
                     }
                 }
                         }
                     }
                 }

+

                 Rect rgnBounds ;
                 GetRegionBounds( updateRgn , &rgnBounds ) ;
 #if wxMAC_DEBUG_REDRAW
                 Rect rgnBounds ;
                 GetRegionBounds( updateRgn , &rgnBounds ) ;
 #if wxMAC_DEBUG_REDRAW


@@ -282,10 +260,10 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
                     {
                         wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;
                     if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
                     {
                         wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;

-                        
+

                         // this parameter is not provided on non-composited windows
                         created = true ;
                         // this parameter is not provided on non-composited windows
                         created = true ;

-                        // rest of the code expects this to be already transformed and clipped for local 
+                        // rest of the code expects this to be already transformed and clipped for local

                         CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ;
                         Rect bounds ;
                         GetPortBounds( port , &bounds ) ;
                         CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ;
                         Rect bounds ;
                         GetPortBounds( port , &bounds ) ;


@@ -299,15 +277,15 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
                         CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
                         CGContextScaleCTM( cgContext , 1 , -1 ) ;
 
                         CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
                         CGContextScaleCTM( cgContext , 1 , -1 ) ;

-                        
+

                         CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ;
                         CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ;

-                        
-                        /*
+
+#if 0

                         CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;
                         CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;

-                        CGContextFillRect(cgContext , CGRectMake( 0 , 0 , 
-                            controlBounds.right - controlBounds.left , 
+                        CGContextFillRect(cgContext , CGRectMake( 0 , 0 ,
+                            controlBounds.right - controlBounds.left ,

                             controlBounds.bottom - controlBounds.top ) );
                             controlBounds.bottom - controlBounds.top ) );

-                        */
+#endif

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


@@ -320,25 +298,28 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                         thisWindow->MacSetCGContextRef( NULL ) ;
                     }
                     if ( created )
                         thisWindow->MacSetCGContextRef( NULL ) ;
                     }
                     if ( created )

-                    {

                         CGContextRelease( cgContext ) ;
                         CGContextRelease( cgContext ) ;

-                    }

 #endif
                 }
 #endif
                 }

+

                 if ( allocatedRgn )
                     DisposeRgn( allocatedRgn ) ;
             }
             break ;
                 if ( allocatedRgn )
                     DisposeRgn( allocatedRgn ) ;
             }
             break ;

+

         case kEventControlVisibilityChanged :
         case kEventControlVisibilityChanged :

-                thisWindow->MacVisibilityChanged() ;
+            thisWindow->MacVisibilityChanged() ;

             break ;
             break ;

+

         case kEventControlEnabledStateChanged :
         case kEventControlEnabledStateChanged :

-                thisWindow->MacEnabledStateChanged() ;
+            thisWindow->MacEnabledStateChanged() ;

             break ;
             break ;

+

         case kEventControlHiliteChanged :
         case kEventControlHiliteChanged :

-                thisWindow->MacHiliteChanged() ;
+            thisWindow->MacHiliteChanged() ;

             break ;
 #endif
             break ;
 #endif

+

         // we emulate this event under Carbon CFM
         case kEventControlSetFocusPart :
             {
         // we emulate this event under Carbon CFM
         case kEventControlSetFocusPart :
             {


@@ -349,17 +330,23 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 {
                 }
 #endif
                 {
                 }
 #endif

+

                 if ( controlPart == kControlFocusNoPart )
                 {
                 if ( controlPart == kControlFocusNoPart )
                 {

-        #if wxUSE_CARET
+#if wxUSE_CARET

                     if ( thisWindow->GetCaret() )
                     if ( thisWindow->GetCaret() )

-                    {

                         thisWindow->GetCaret()->OnKillFocus();
                         thisWindow->GetCaret()->OnKillFocus();

+#endif
+
+                    static bool inKillFocusEvent = false ;
+                    if ( !inKillFocusEvent )
+                    {
+                        inKillFocusEvent = true ;
+                        wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+                        event.SetEventObject(thisWindow);
+                        thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                        inKillFocusEvent = false ;

                     }
                     }

-        #endif // wxUSE_CARET
-                    wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
-                    event.SetEventObject(thisWindow);
-                    thisWindow->GetEventHandler()->ProcessEvent(event) ;

                 }
                 else
                 {
                 }
                 else
                 {


@@ -367,29 +354,29 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     wxChildFocusEvent eventFocus(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
 
                     wxChildFocusEvent eventFocus(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
 

-        #if wxUSE_CARET
+#if wxUSE_CARET

                     if ( thisWindow->GetCaret() )
                     if ( thisWindow->GetCaret() )

-                    {

                         thisWindow->GetCaret()->OnSetFocus();
                         thisWindow->GetCaret()->OnSetFocus();

-                    }
-        #endif // wxUSE_CARET
+#endif

 
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }
 
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
                     thisWindow->GetEventHandler()->ProcessEvent(event) ;
                 }

+

                 if ( thisWindow->MacIsUserPane() )
                     result = noErr ;
             }
             break ;
                 if ( thisWindow->MacIsUserPane() )
                     result = noErr ;
             }
             break ;

+

         case kEventControlHit :
         case kEventControlHit :

-            {
-                result = thisWindow->MacControlHit( handler , event ) ;
-            }
+            result = thisWindow->MacControlHit( handler , event ) ;

             break ;
             break ;

+

         default :
             break ;
     }
         default :
             break ;
     }

+

     return result ;
 }
 
     return result ;
 }
 


@@ -404,16 +391,16 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
     wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 
     wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
     cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
 

-    switch( GetEventKind( event ) )
+    switch ( GetEventKind( event ) )

     {
         case kEventServiceGetTypes :
     {
         case kEventServiceGetTypes :

-            if( textCtrl )
+            if ( textCtrl )

             {
                 long from, to ;
                 textCtrl->GetSelection( &from , &to ) ;
 
                 CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
             {
                 long from, to ;
                 textCtrl->GetSelection( &from , &to ) ;
 
                 CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;

-                if( from != to )
+                if ( from != to )

                     copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
                 if ( textCtrl->IsEditable() )
                     pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
                     copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
                 if ( textCtrl->IsEditable() )
                     pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;


@@ -428,25 +415,30 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                             CFArrayAppendValue (copyTypes, typestring) ;
                         if ( pasteTypes )
                             CFArrayAppendValue (pasteTypes, typestring) ;
                             CFArrayAppendValue (copyTypes, typestring) ;
                         if ( pasteTypes )
                             CFArrayAppendValue (pasteTypes, typestring) ;

+

                         CFRelease( typestring ) ;
                     }
                 }
                         CFRelease( typestring ) ;
                     }
                 }

+

                 result = noErr ;
             }
             break ;
                 result = noErr ;
             }
             break ;

+

         case kEventServiceCopy :
             if ( textCtrl )
             {
                 long from, to ;
         case kEventServiceCopy :
             if ( textCtrl )
             {
                 long from, to ;

+

                 textCtrl->GetSelection( &from , &to ) ;
                 wxString val = textCtrl->GetValue() ;
                 val = val.Mid( from , to - from ) ;
                 ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
                 verify_noerr( ClearScrap( &scrapRef ) ) ;
                 textCtrl->GetSelection( &from , &to ) ;
                 wxString val = textCtrl->GetValue() ;
                 val = val.Mid( from , to - from ) ;
                 ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
                 verify_noerr( ClearScrap( &scrapRef ) ) ;

-                verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.Length() , val.c_str() ) ) ;
+                verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.length() , val.c_str() ) ) ;

                 result = noErr ;
             }
             break ;
                 result = noErr ;
             }
             break ;

+

         case kEventServicePaste :
             if ( textCtrl )
             {
         case kEventServicePaste :
             if ( textCtrl )
             {


@@ -457,15 +449,20 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                 char *content = new char[textSize] ;
                 GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );
                 content[textSize-1] = 0 ;
                 char *content = new char[textSize] ;
                 GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );
                 content[textSize-1] = 0 ;

+

 #if wxUSE_UNICODE
                 textCtrl->WriteText( wxString( content , wxConvLocal )  );
 #else
                 textCtrl->WriteText( wxString( content ) ) ;
 #endif
 #if wxUSE_UNICODE
                 textCtrl->WriteText( wxString( content , wxConvLocal )  );
 #else
                 textCtrl->WriteText( wxString( content ) ) ;
 #endif

+

                 delete[] content ;
                 result = noErr ;
             }
             break ;
                 delete[] content ;
                 result = noErr ;
             }
             break ;

+
+        default:
+            break ;

     }
 
     return result ;
     }
 
     return result ;


@@ -483,12 +480,17 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
         case kEventClassControl :
             result = wxMacWindowControlEventHandler( handler, event, data ) ;
             break ;
         case kEventClassControl :
             result = wxMacWindowControlEventHandler( handler, event, data ) ;
             break ;

+

         case kEventClassService :
             result = wxMacWindowServiceEventHandler( handler, event , data ) ;
         case kEventClassService :
             result = wxMacWindowServiceEventHandler( handler, event , data ) ;

+            break ;
+

         default :
             break ;
     }
         default :
             break ;
     }

+

     wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
     wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;

+

     return result ;
 }
 
     return result ;
 }
 


@@ -574,9 +576,9 @@ wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBac
 
 void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
 {
 
 void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
 {

+    int x = 0 , y = 0;

     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;
     RgnHandle rgn = NewRgn() ;
     GetClip( rgn ) ;

-    int x = 0 , y = 0;

     MacWindowToRootWindow( &x,&y ) ;
     OffsetRgn( rgn , -x , -y ) ;
     wxMacWindowStateSaver sv( this ) ;
     MacWindowToRootWindow( &x,&y ) ;
     OffsetRgn( rgn , -x , -y ) ;
     wxMacWindowStateSaver sv( this ) ;


@@ -610,7 +612,10 @@ void wxWindowMac::MacControlUserPaneActivateProc(bool activating)
 
 wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
 {
 
 wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
 {

-    return kControlNoPart ;
+    if ( AcceptsFocus() )
+        return 1 ;
+    else
+        return kControlNoPart ;

 }
 
 void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)
 }
 
 void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)


@@ -630,9 +635,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
     {
         wxWindow*  wx = wxFindControlFromMacControl( control ) ;
         if ( wx )
     {
         wxWindow*  wx = wxFindControlFromMacControl( control ) ;
         if ( wx )

-        {

             wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
             wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;

-        }

     }
 }
 wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
     }
 }
 wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;


@@ -641,35 +644,6 @@ wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

-#if KEY_wxList_DEPRECATED
-wxList wxWinMacControlList(wxKEY_INTEGER);
-
-wxWindow *wxFindControlFromMacControl(ControlRef inControl )
-{
-    wxNode *node = wxWinMacControlList.Find((long)inControl);
-    if (!node)
-        return NULL;
-    return (wxControl *)node->GetData();
-}
-
-void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
-{
-    // adding NULL ControlRef is (first) surely a result of an error and
-    // (secondly) breaks native event processing
-    wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
-
-    if ( !wxWinMacControlList.Find((long)inControl) )
-        wxWinMacControlList.Append((long)inControl, control);
-}
-
-void wxRemoveMacControlAssociation(wxWindow *control)
-{
-    // remove all associations pointing to us
-    while ( wxWinMacControlList.DeleteObject(control) )
-        {}
-}
-#else
-

 WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;
 WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
 
 static MacControlMap wxWinMacControlList;


@@ -697,7 +671,7 @@ void wxRemoveMacControlAssociation(wxWindow *control)
     // we should go on...
 
     bool found = true ;
     // we should go on...
 
     bool found = true ;

-    while( found )
+    while ( found )

     {
         found = false ;
         MacControlMap::iterator it;
     {
         found = false ;
         MacControlMap::iterator it;


@@ -712,7 +686,6 @@ void wxRemoveMacControlAssociation(wxWindow *control)
         }
     }
 }
         }
     }
 }

-#endif // deprecated wxList

 
 // ----------------------------------------------------------------------------
  // constructors and such
 
 // ----------------------------------------------------------------------------
  // constructors and such


@@ -739,22 +712,24 @@ void wxWindowMac::Init()
     m_peer = NULL ;
     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4
     m_peer = NULL ;
     m_frozenness = 0 ;
 #if WXWIN_COMPATIBILITY_2_4

-    m_backgroundTransparent = FALSE;
+    m_backgroundTransparent = false;
+#endif
+
+#if wxMAC_USE_CORE_GRAPHICS
+    m_cgContextRef = NULL ;

 #endif
 
     // as all windows are created with WS_VISIBLE style...
 #endif
 
     // as all windows are created with WS_VISIBLE style...

-    m_isShown = TRUE;
+    m_isShown = true;

 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
     m_macBackgroundBrush = wxNullBrush ;
 

-    m_macIsUserPane = TRUE;
-#if wxMAC_USE_CORE_GRAPHICS
-    m_cgContextRef = NULL ;
-#endif
+    m_macIsUserPane = true;

     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;

+

     // we need a valid font for the encodings
     wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 }
     // we need a valid font for the encodings
     wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 }


@@ -764,7 +739,7 @@ wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
 
 {
     SendDestroyEvent();
 

-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;

 
     MacInvalidateBorders() ;
 
 
     MacInvalidateBorders() ;
 


@@ -776,9 +751,7 @@ wxWindowMac::~wxWindowMac()
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )

-            {

                 frame->SetLastFocus((wxWindow*)NULL);
                 frame->SetLastFocus((wxWindow*)NULL);

-            }

             break;
         }
     }
             break;
         }
     }


@@ -796,19 +769,19 @@ wxWindowMac::~wxWindowMac()
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }
         if (parent->GetDefaultItem() == (wxButton*) this)
             parent->SetDefaultItem(NULL);
     }

+

     if ( m_peer && m_peer->Ok() )
     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;
     if ( m_peer && m_peer->Ok() )
     {
         // in case the callback might be called during destruction
         wxRemoveMacControlAssociation( this) ;

+        ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ;

         // we currently are not using this hook
         // ::SetControlColorProc( *m_peer , NULL ) ;
         m_peer->Dispose() ;
     }
 
     if ( g_MacLastWindow == this )
         // we currently are not using this hook
         // ::SetControlColorProc( *m_peer , NULL ) ;
         m_peer->Dispose() ;
     }
 
     if ( g_MacLastWindow == this )

-    {

         g_MacLastWindow = NULL ;
         g_MacLastWindow = NULL ;

-    }

 
     wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
     if ( frame )
 
     wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
     if ( frame )


@@ -824,7 +797,8 @@ wxWindowMac::~wxWindowMac()
         delete m_dropTarget;
         m_dropTarget = NULL;
     }
         delete m_dropTarget;
         m_dropTarget = NULL;
     }

-#endif // wxUSE_DRAG_AND_DROP
+#endif
+

     delete m_peer ;
 }
 
     delete m_peer ;
 }
 


@@ -840,6 +814,7 @@ void wxWindowMac::MacInstallEventHandler( WXWidget control )
     InstallControlEventHandler( (ControlRef)  control , GetwxMacWindowEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&m_macControlEventHandler);
     InstallControlEventHandler( (ControlRef)  control , GetwxMacWindowEventHandlerUPP(),
         GetEventTypeCount(eventList), eventList, this,
         (EventHandlerRef *)&m_macControlEventHandler);

+

 #if !TARGET_API_MAC_OSX
     if ( (ControlRef) control == m_peer->GetControlRef() )
     {
 #if !TARGET_API_MAC_OSX
     if ( (ControlRef) control == m_peer->GetControlRef() )
     {


@@ -853,7 +828,6 @@ void wxWindowMac::MacInstallEventHandler( WXWidget control )
         m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl,kControlUserPaneBackgroundProcTag,GetwxMacControlUserPaneBackgroundProc()) ;
     }
 #endif
         m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl,kControlUserPaneBackgroundProcTag,GetwxMacControlUserPaneBackgroundProc()) ;
     }
 #endif

-

 }
 
 // Constructor
 }
 
 // Constructor


@@ -863,10 +837,10 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            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") );

 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
 
     if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )

-        return FALSE;
+        return false;

 
     m_windowVariant = parent->GetWindowVariant() ;
 
 
     m_windowVariant = parent->GetWindowVariant() ;
 


@@ -904,20 +878,15 @@ bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
     wxWindowCreateEvent event(this);
     GetEventHandler()->AddPendingEvent(event);
 
     wxWindowCreateEvent event(this);
     GetEventHandler()->AddPendingEvent(event);
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxWindowMac::MacChildAdded() 
+void wxWindowMac::MacChildAdded()

 {
     if ( m_vScrollBar )
 {
     if ( m_vScrollBar )

-    {

         m_vScrollBar->Raise() ;
         m_vScrollBar->Raise() ;

-    }

     if ( m_hScrollBar )
     if ( m_hScrollBar )

-    {

         m_hScrollBar->Raise() ;
         m_hScrollBar->Raise() ;

-    }
-

 }
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
 }
 
 void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)


@@ -937,12 +906,10 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 

-    m_peer->SetTitle( wxStripMenuCodes(m_label) ) ;
+    m_peer->SetLabel( wxStripMenuCodes(m_label) ) ;

 
     if (!m_macIsUserPane)
 
     if (!m_macIsUserPane)

-    {

         SetInitialBestSize(size);
         SetInitialBestSize(size);

-    }

 
     SetCursor( *wxSTANDARD_CURSOR ) ;
 }
 
     SetCursor( *wxSTANDARD_CURSOR ) ;
 }


@@ -971,10 +938,12 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             size = kControlSizeNormal;
             themeFont = kThemeSystemFont ;
             break ;
             size = kControlSizeNormal;
             themeFont = kThemeSystemFont ;
             break ;

+

         case wxWINDOW_VARIANT_SMALL :
             size = kControlSizeSmall;
             themeFont = kThemeSmallSystemFont ;
             break ;
         case wxWINDOW_VARIANT_SMALL :
             size = kControlSizeSmall;
             themeFont = kThemeSmallSystemFont ;
             break ;

+

         case wxWINDOW_VARIANT_MINI :
            if (UMAGetSystemVersion() >= 0x1030 )
             {
         case wxWINDOW_VARIANT_MINI :
            if (UMAGetSystemVersion() >= 0x1030 )
             {


@@ -988,14 +957,17 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
                 themeFont = kThemeSmallSystemFont ;
             }
             break ;
                 themeFont = kThemeSmallSystemFont ;
             }
             break ;

+

         case wxWINDOW_VARIANT_LARGE :
             size = kControlSizeLarge;
             themeFont = kThemeSystemFont ;
             break ;
         case wxWINDOW_VARIANT_LARGE :
             size = kControlSizeLarge;
             themeFont = kThemeSystemFont ;
             break ;

+

         default:
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }
         default:
             wxFAIL_MSG(_T("unexpected window variant"));
             break ;
     }

+

     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag,&size ) ;
 
     wxFont font ;
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag,&size ) ;
 
     wxFont font ;


@@ -1036,17 +1008,12 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
     if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
     wxBrush brush ;
     wxColour newCol(GetBackgroundColour());
     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 ) ;
         brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;

-    }

     else
     else

-    {

         brush.SetColour( newCol ) ;
         brush.SetColour( newCol ) ;

-    }
+

     MacSetBackgroundBrush( brush ) ;
 
     MacUpdateControlFont() ;
     MacSetBackgroundBrush( brush ) ;
 
     MacUpdateControlFont() ;


@@ -1068,58 +1035,62 @@ bool wxWindowMac::MacCanFocus() const
     // in event handlers...
     UInt32 features = 0 ;
     m_peer->GetFeatures( & features ) ;
     // in event handlers...
     UInt32 features = 0 ;
     m_peer->GetFeatures( & features ) ;

+

     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
 }
 
     return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
 }
 

-

 void wxWindowMac::SetFocus()
 {
 void wxWindowMac::SetFocus()
 {

-    if ( AcceptsFocus() )
-    {
-
-        wxWindow* former = FindFocus() ;
-        if ( former == this )
+    if ( !AcceptsFocus() )

             return ;
 
             return ;
 

-        OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
-        // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only
-        // leave in case of an error
-        if ( err == errCouldntSetFocus )
-            return ;
+    wxWindow* former = FindFocus() ;
+    if ( former == this )
+        return ;
+
+    // as we cannot rely on the control features to find out whether we are in full keyboard mode,
+    // we can only leave in case of an error
+    OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
+    if ( err == errCouldntSetFocus )
+        return ;
+
+    // enable for patch 1376506 - perhaps? (Stefan's version)
+#if 1
+    SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
+#endif

 
 #if !TARGET_API_MAC_OSX
 
 #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 ) );
+    // 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 ) );

 
 

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

 
 

-            wxMacWindowEventHandler( NULL , evRef , former ) ;
-            ReleaseEvent(evRef) ;
-        }
-        // send new focus event
-        {
-            EventRef evRef = NULL ;
-            verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
-                &evRef ) );
+        wxMacWindowEventHandler( NULL , evRef , former ) ;
+        ReleaseEvent(evRef) ;
+    }

 
 

-            wxMacCarbonEvent cEvent( evRef ) ;
-            cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
-            cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+    // send new focus event
+    {
+        EventRef evRef = NULL ;
+        verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
+            &evRef ) );

 
 

-            wxMacWindowEventHandler( NULL , evRef , this ) ;
-            ReleaseEvent(evRef) ;
-        }
-#endif
+        wxMacCarbonEvent cEvent( evRef ) ;
+        cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
+        cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+
+        wxMacWindowEventHandler( NULL , evRef , this ) ;
+        ReleaseEvent(evRef) ;

     }
     }

+#endif

 }
 
 }
 

-

 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = this ;
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = this ;


@@ -1135,16 +1106,15 @@ void wxWindowMac::DoReleaseMouse()
     wxApp::s_captureWindow = NULL ;
 }
 
     wxApp::s_captureWindow = NULL ;
 }
 

-#if    wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {
 
 void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 {

-    if ( m_dropTarget != 0 ) {
+    if ( m_dropTarget != NULL )

         delete m_dropTarget;
         delete m_dropTarget;

-    }

 
     m_dropTarget = pDropTarget;
 
     m_dropTarget = pDropTarget;

-    if ( m_dropTarget != 0 )
+    if ( m_dropTarget != NULL )

     {
         // TODO
     }
     {
         // TODO
     }


@@ -1175,7 +1145,7 @@ bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
                                        int& w, int& h , bool adjustOrigin ) const
 {
     bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;
                                        int& w, int& h , bool adjustOrigin ) const
 {
     bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;

-    
+

     // the desired size, minus the border pixels gives the correct size of the control
 
     x = (int)pos.x;
     // the desired size, minus the border pixels gives the correct size of the control
 
     x = (int)pos.x;


@@ -1211,8 +1181,10 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
     Rect bounds ;
     m_peer->GetRect( &bounds ) ;
 
     Rect bounds ;
     m_peer->GetRect( &bounds ) ;
 

-    if(x)   *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
-    if(y)   *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+    if (x)
+       *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    if (y)
+       *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;

 }
 
 // get the position of the bounds of this window in client coordinates of its parent
 }
 
 // get the position of the bounds of this window in client coordinates of its parent


@@ -1220,7 +1192,7 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     Rect bounds ;
     m_peer->GetRect( &bounds ) ;
 {
     Rect bounds ;
     m_peer->GetRect( &bounds ) ;

-    
+

     int x1 = bounds.left ;
     int y1 = bounds.top ;
 
     int x1 = bounds.left ;
     int y1 = bounds.top ;
 


@@ -1233,17 +1205,22 @@ void wxWindowMac::DoGetPosition(int *x, int *y) const
         wxWindow *parent = GetParent();
         if ( parent )
         {
         wxWindow *parent = GetParent();
         if ( parent )
         {

-            // we must first adjust it to be in window coordinates of the parent, as otherwise it gets lost by the clientareaorigin fix
+            // we must first adjust it to be in window coordinates of the parent,
+            // as otherwise it gets lost by the ClientAreaOrigin fix

             x1 += parent->MacGetLeftBorderSize() ;
             y1 += parent->MacGetTopBorderSize() ;
             x1 += parent->MacGetLeftBorderSize() ;
             y1 += parent->MacGetTopBorderSize() ;

+

             // and now to client coordinates
             wxPoint pt(parent->GetClientAreaOrigin());
             x1 -= pt.x ;
             y1 -= pt.y ;
         }
     }
             // and now to client coordinates
             wxPoint pt(parent->GetClientAreaOrigin());
             x1 -= pt.x ;
             y1 -= pt.y ;
         }
     }

-    if(x)   *x = x1 ;
-    if(y)   *y = y1 ;
+
+    if (x)
+       *x = x1 ;
+    if (y)
+       *y = y1 ;

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


@@ -1253,21 +1230,28 @@ void wxWindowMac::DoScreenToClient(int *x, int *y) const
     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 ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;
     MacRootWindowToWindow( x , y ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x -= origin.x ;
-    if(y)   *y -= origin.y ;
+    if (x)
+       *x -= origin.x ;
+    if (y)
+       *y -= origin.y ;

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


@@ -1276,26 +1260,36 @@ void wxWindowMac::DoClientToScreen(int *x, int *y) const
     wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;
     wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x += origin.x ;
-    if(y)   *y += origin.y ;
+    if (x)
+       *x += origin.x ;
+    if (y)
+       *y += origin.y ;

 
     MacWindowToRootWindow( x , y ) ;
 
     {
         Point localwhere = { 0,0 };
 
     MacWindowToRootWindow( x , y ) ;
 
     {
         Point localwhere = { 0,0 };

-        if(x)   localwhere.h = * x ;
-        if(y)   localwhere.v = * y ;
+        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
 {
     wxPoint origin = GetClientAreaOrigin() ;
     }
 }
 
 void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
 {
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x += origin.x ;
-    if(y)   *y += origin.y ;
+    if (x)
+       *x += origin.x ;
+    if (y)
+       *y += origin.y ;

 
     MacWindowToRootWindow( x , y ) ;
 }
 
     MacWindowToRootWindow( x , y ) ;
 }


@@ -1305,15 +1299,19 @@ void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
     MacRootWindowToWindow( x , y ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;
     MacRootWindowToWindow( x , y ) ;
 
     wxPoint origin = GetClientAreaOrigin() ;

-    if(x)   *x -= origin.x ;
-    if(y)   *y -= origin.y ;
+    if (x)
+       *x -= origin.x ;
+    if (y)
+       *y -= origin.y ;

 }
 
 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 ) pt.y = *y ;
+    if (x)
+        pt.x = *x ;
+    if (y)
+        pt.y = *y ;

 
     if ( !IsTopLevel() )
     {
 
     if ( !IsTopLevel() )
     {


@@ -1326,25 +1324,37 @@ void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
         }
     }
 
         }
     }
 

-    if ( x ) *x = (int) pt.x ;
-    if ( y ) *y = (int) pt.y ;
+    if (x)
+        *x = (int) pt.x ;
+    if (y)
+        *y = (int) pt.y ;

 }
 
 void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
 {
     int x1 , y1 ;
 }
 
 void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
 {
     int x1 , y1 ;

-    if ( x ) x1 = *x ;
-    if ( y ) y1 = *y ;
+
+    if (x)
+        x1 = *x ;
+    if (y)
+        y1 = *y ;
+

     MacWindowToRootWindow( &x1 , &y1 ) ;
     MacWindowToRootWindow( &x1 , &y1 ) ;

-    if ( x ) *x = x1 ;
-    if ( y ) *y = y1 ;
+
+    if (x)
+        *x = x1 ;
+    if (y)
+        *y = y1 ;

 }
 
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {
     wxPoint pt ;
 }
 
 void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
 {
     wxPoint pt ;

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

 
     if ( !IsTopLevel() )
     {
 
     if ( !IsTopLevel() )
     {


@@ -1357,18 +1367,27 @@ void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
         }
     }
 
         }
     }
 

-    if ( x ) *x = (int) pt.x ;
-    if ( y ) *y = (int) pt.y ;
+    if (x)
+        *x = (int) pt.x ;
+    if (y)
+        *y = (int) pt.y ;

 }
 
 void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
 {
     int x1 , y1 ;
 }
 
 void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
 {
     int x1 , y1 ;

-    if ( x ) x1 = *x ;
-    if ( y ) y1 = *y ;
+
+    if (x)
+        x1 = *x ;
+    if (y)
+        y1 = *y ;
+

     MacRootWindowToWindow( &x1 , &y1 ) ;
     MacRootWindowToWindow( &x1 , &y1 ) ;

-    if ( x ) *x = x1 ;
-    if ( y ) *y = y1 ;
+
+    if (x)
+        *x = x1 ;
+    if (y)
+        *y = y1 ;

 }
 
 void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
 }
 
 void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )


@@ -1381,7 +1400,7 @@ void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , in
         GetRegionBounds( rgn , &content ) ;
         m_peer->GetRect( &structure ) ;
         OffsetRect( &structure, -structure.left , -structure.top ) ;
         GetRegionBounds( rgn , &content ) ;
         m_peer->GetRect( &structure ) ;
         OffsetRect( &structure, -structure.left , -structure.top ) ;

-        
+

         left = content.left - structure.left ;
         top = content.top  - structure.top ;
         right = structure.right - content.right ;
         left = content.left - structure.left ;
         top = content.top  - structure.top ;
         right = structure.right - content.right ;


@@ -1399,7 +1418,6 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     wxSize sizeTotal = size;
 
     RgnHandle rgn = NewRgn() ;
     wxSize sizeTotal = size;
 
     RgnHandle rgn = NewRgn() ;

-

     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         Rect content ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
     {
         Rect content ;


@@ -1414,66 +1432,60 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     }
     DisposeRgn( rgn ) ;
 
     }
     DisposeRgn( rgn ) ;
 

-    sizeTotal.x += MacGetLeftBorderSize(  ) + MacGetRightBorderSize( ) ;
-    sizeTotal.y += MacGetTopBorderSize(  ) + MacGetBottomBorderSize( ) ;
+    sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;

 
     return sizeTotal;
 }
 
 
     return sizeTotal;
 }
 

-

 // Get size *available for subwindows* i.e. excluding menu bar etc.
 // Get size *available for subwindows* i.e. excluding menu bar etc.

-void wxWindowMac::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize( int *x, int *y ) const

 {
     int ww, hh;
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
 {
     int ww, hh;
 
     RgnHandle rgn = NewRgn() ;
     Rect content ;
     if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )

-    {

         GetRegionBounds( rgn , &content ) ;
         GetRegionBounds( rgn , &content ) ;

-    }

     else
     else

-    {

         m_peer->GetRect( &content ) ;
         m_peer->GetRect( &content ) ;

-    }

     DisposeRgn( rgn ) ;
 
     ww = content.right - content.left ;
     hh = content.bottom - content.top ;
 
     if (m_hScrollBar  && m_hScrollBar->IsShown() )
     DisposeRgn( rgn ) ;
 
     ww = content.right - content.left ;
     hh = content.bottom - content.top ;
 
     if (m_hScrollBar  && m_hScrollBar->IsShown() )

-    {

         hh -= m_hScrollBar->GetSize().y ;
         hh -= m_hScrollBar->GetSize().y ;

-    }
+

     if (m_vScrollBar  && m_vScrollBar->IsShown() )
     if (m_vScrollBar  && m_vScrollBar->IsShown() )

-    {

         ww -= m_vScrollBar->GetSize().x ;
         ww -= m_vScrollBar->GetSize().x ;

-    }
-    if(x)   *x = ww;
-    if(y)   *y = hh;
+
+    if (x)
+       *x = ww;
+    if (y)
+       *y = hh;

 
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)
 
 }
 
 bool wxWindowMac::SetCursor(const wxCursor& cursor)
 {
     if (m_cursor == cursor)

-        return FALSE;
+        return false;

 
     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
 
     if (wxNullCursor == cursor)
     {
         if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )

-            return FALSE ;
+            return false ;

     }
     else
     {
         if ( ! wxWindowBase::SetCursor( cursor ) )
     }
     else
     {
         if ( ! wxWindowBase::SetCursor( cursor ) )

-            return FALSE ;
+            return false ;

     }
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 
     }
 
     wxASSERT_MSG( m_cursor.Ok(),
         wxT("cursor must be valid after call to the base version"));
 

-

     wxWindowMac *mouseWin = 0 ;
     {
         wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ;
     wxWindowMac *mouseWin = 0 ;
     {
         wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ;


@@ -1497,11 +1509,9 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
     }
 
     if ( mouseWin == this && !wxIsBusy() )
     }
 
     if ( mouseWin == this && !wxIsBusy() )

-    {

         m_cursor.MacInstall() ;
         m_cursor.MacInstall() ;

-    }

 
 

-    return TRUE ;
+    return true ;

 }
 
 #if wxUSE_MENUS
 }
 
 #if wxUSE_MENUS


@@ -1530,16 +1540,15 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         wxMenu* realmenu ;
         item = menu->FindItem(id, &realmenu) ;
         if (item->IsCheckable())
         wxMenu* realmenu ;
         item = menu->FindItem(id, &realmenu) ;
         if (item->IsCheckable())

-        {

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

-        }
+

         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }
     menu->MacAfterDisplay( true ) ;
 
     menu->SetInvokingWindow(NULL);
 
         menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
     }
     menu->MacAfterDisplay( true ) ;
 
     menu->SetInvokingWindow(NULL);
 

-  return TRUE;
+  return true;

 }
 #endif
 
 }
 #endif
 


@@ -1559,7 +1568,7 @@ void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
 
 #endif // wxUSE_TOOLTIPS
 
 
 #endif // wxUSE_TOOLTIPS
 

-void wxWindowMac::MacInvalidateBorders() 
+void wxWindowMac::MacInvalidateBorders()

 {
     if ( m_peer == NULL )
         return ;
 {
     if ( m_peer == NULL )
         return ;


@@ -1567,18 +1576,18 @@ void wxWindowMac::MacInvalidateBorders()
     bool vis = MacIsReallyShown() ;
     if ( !vis )
         return ;
     bool vis = MacIsReallyShown() ;
     if ( !vis )
         return ;

-        
+

     int outerBorder = MacGetLeftBorderSize() ;
     if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
         outerBorder += 4 ;
 
     if ( outerBorder == 0 )
         return ;
     int outerBorder = MacGetLeftBorderSize() ;
     if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
         outerBorder += 4 ;
 
     if ( outerBorder == 0 )
         return ;

-        
-    // now we know that we have something to do at all    
+
+    // 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
 
     // as the borders are drawn on the parent we have to properly invalidate all these areas

-    RgnHandle   updateInner = NewRgn() , 
+    RgnHandle   updateInner = NewRgn() ,

                 updateOuter = NewRgn() ;
 
     // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
                 updateOuter = NewRgn() ;
 
     // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon


@@ -1588,6 +1597,7 @@ void wxWindowMac::MacInvalidateBorders()
     InsetRect( &rect , -outerBorder , -outerBorder ) ;
     RectRgn( updateOuter , &rect ) ;
     DiffRgn( updateOuter , updateInner ,updateOuter ) ;
     InsetRect( &rect , -outerBorder , -outerBorder ) ;
     RectRgn( updateOuter , &rect ) ;
     DiffRgn( updateOuter , updateInner ,updateOuter ) ;

+

 #ifdef __WXMAC_OSX__
     GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
 #else
 #ifdef __WXMAC_OSX__
     GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
 #else


@@ -1595,23 +1605,26 @@ void wxWindowMac::MacInvalidateBorders()
     if ( tlw )
         InvalWindowRgn( tlw , updateOuter ) ;
 #endif
     if ( tlw )
         InvalWindowRgn( tlw , updateOuter ) ;
 #endif

+

     DisposeRgn(updateOuter) ;
     DisposeRgn(updateInner) ;
     DisposeRgn(updateOuter) ;
     DisposeRgn(updateInner) ;

-/*
-            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) ;
-*/
-/*
+
+#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
     if ( m_peer )
     {
         // deleting a window while it is shown invalidates the region occupied by border or


@@ -1641,7 +1654,8 @@ void wxWindowMac::MacInvalidateBorders()
             DisposeRgn(updateTotal) ;
         }
     }
             DisposeRgn(updateTotal) ;
         }
     }

-*/
+#endif
+

 #if 0
     Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
 
 #if 0
     Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
 


@@ -1720,41 +1734,36 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
     if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))

-        actualHeight = m_maxHeight;    
+        actualHeight = m_maxHeight;

 
     bool doMove = false ;
     bool doResize = false ;
 
     if ( actualX != former_x || actualY != former_y )
 
     bool doMove = false ;
     bool doResize = false ;
 
     if ( actualX != former_x || actualY != former_y )

-    {

         doMove = true ;
         doMove = true ;

-    }
+

     if ( actualWidth != former_w || actualHeight != former_h )
     if ( actualWidth != former_w || actualHeight != former_h )

-    {

         doResize = true ;
         doResize = true ;

-    }

 
     if ( doMove || doResize )
     {
 
     if ( doMove || doResize )
     {

-        // as the borders are drawn outside the native control, we adjust now    
+        // as the borders are drawn outside the native control, we adjust now

 
 

-        wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ), 
-            wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) , 
+        wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
+            wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,

                 actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
 
         Rect r ;
         wxMacRectToNative( &bounds , &r ) ;
 
         if ( !GetParent()->IsTopLevel() )
                 actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
 
         Rect r ;
         wxMacRectToNative( &bounds , &r ) ;
 
         if ( !GetParent()->IsTopLevel() )

-        {

             wxMacWindowToNative( GetParent() , &r ) ;
             wxMacWindowToNative( GetParent() , &r ) ;

-        }

 
         MacInvalidateBorders() ;
 
         MacInvalidateBorders() ;

-        
+

         m_cachedClippedRectValid = false ;
         m_peer->SetRect( &r ) ;
         m_cachedClippedRectValid = false ;
         m_peer->SetRect( &r ) ;

-        
+

         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 
         MacInvalidateBorders() ;
         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
 
         MacInvalidateBorders() ;


@@ -1767,6 +1776,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;
         }
             event.SetEventObject(this);
             GetEventHandler()->ProcessEvent(event) ;
         }

+

         if ( doResize )
         {
             MacRepositionScrollBars() ;
         if ( doResize )
         {
             MacRepositionScrollBars() ;


@@ -1776,7 +1786,6 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             GetEventHandler()->ProcessEvent(event);
         }
     }
             GetEventHandler()->ProcessEvent(event);
         }
     }

-

 }
 
 wxSize wxWindowMac::DoGetBestSize() const
 }
 
 wxSize wxWindowMac::DoGetBestSize() const


@@ -1797,12 +1806,12 @@ wxSize wxWindowMac::DoGetBestSize() const
         {
             bestsize.bottom = 16 ;
         }
         {
             bestsize.bottom = 16 ;
         }

-#if wxUSE_SPINBTN 
+#if wxUSE_SPINBTN

         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {
             bestsize.bottom = 24 ;
         }
         else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
         {
             bestsize.bottom = 24 ;
         }

-#endif // wxUSE_SPINBTN 
+#endif // wxUSE_SPINBTN

         else
         {
             // return wxWindowBase::DoGetBestSize() ;
         else
         {
             // return wxWindowBase::DoGetBestSize() ;


@@ -1817,7 +1826,6 @@ wxSize wxWindowMac::DoGetBestSize() const
     return wxSize(bestWidth, bestHeight);
 }
 
     return wxSize(bestWidth, bestHeight);
 }
 

-

 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
 // set the size of the window: if the dimensions are positive, just use them,
 // but if any of them is equal to -1, it means that we must find the value for
 // it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in


@@ -1839,20 +1847,20 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if ( x == currentX && y == currentY &&
         width == currentW && height == currentH && ( height != -1 && width != -1 ) )
     {
     if ( x == currentX && y == currentY &&
         width == currentW && height == currentH && ( height != -1 && width != -1 ) )
     {

-        // TODO REMOVE
+        // TODO: REMOVE

         MacRepositionScrollBars() ; // we might have a real position shift
         return;
     }
 
         MacRepositionScrollBars() ; // we might have a real position shift
         return;
     }
 

-    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

         x = currentX;
         x = currentX;

-    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )

         y = currentY;
 
     AdjustForParentClientOrigin(x, y, sizeFlags);
 
         y = currentY;
 
     AdjustForParentClientOrigin(x, y, sizeFlags);
 

-    wxSize size(-1, -1);
-    if ( width == -1 )
+    wxSize size = wxDefaultSize;
+    if ( width == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_WIDTH )
         {


@@ -1866,11 +1874,11 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    if ( height == -1 )
+    if ( height == wxDefaultCoord )

     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {
     {
         if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
         {

-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )

             {
                 size = DoGetBestSize();
             }
             {
                 size = DoGetBestSize();
             }


@@ -1886,7 +1894,6 @@ 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


@@ -1902,12 +1909,13 @@ wxPoint wxWindowMac::GetClientAreaOrigin() const
         content.left = content.top = 0 ;
     }
     DisposeRgn( rgn ) ;
         content.left = content.top = 0 ;
     }
     DisposeRgn( rgn ) ;

-    return wxPoint( content.left + MacGetLeftBorderSize(  ) , content.top + MacGetTopBorderSize(  ) );
+
+    return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );

 }
 
 void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 {
 }
 
 void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 {

-    if ( clientheight != -1 || clientheight != -1 )
+    if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord )

     {
         int currentclientwidth , currentclientheight ;
         int currentwidth , currentheight ;
     {
         int currentclientwidth , currentclientheight ;
         int currentwidth , currentheight ;


@@ -1915,23 +1923,22 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
         GetClientSize( &currentclientwidth , &currentclientheight ) ;
         GetSize( &currentwidth , &currentheight ) ;
 
         GetClientSize( &currentclientwidth , &currentclientheight ) ;
         GetSize( &currentwidth , &currentheight ) ;
 

-        DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+        DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,

             currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
     }
 }
 
             currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
     }
 }
 

-void wxWindowMac::SetTitle(const wxString& title)
+void wxWindowMac::SetLabel(const wxString& title)

 {
     m_label = wxStripMenuCodes(title) ;
 
     if ( m_peer && m_peer->Ok() )
 {
     m_label = wxStripMenuCodes(title) ;
 
     if ( m_peer && m_peer->Ok() )

-    {
-        m_peer->SetTitle( m_label ) ;
-    }
+        m_peer->SetLabel( m_label ) ;
+

     Refresh() ;
 }
 
     Refresh() ;
 }
 

-wxString wxWindowMac::GetTitle() const
+wxString wxWindowMac::GetLabel() const

 {
     return m_label ;
 }
 {
     return m_label ;
 }


@@ -1940,16 +1947,15 @@ bool wxWindowMac::Show(bool show)
 {
     bool former = MacIsReallyShown() ;
     if ( !wxWindowBase::Show(show) )
 {
     bool former = MacIsReallyShown() ;
     if ( !wxWindowBase::Show(show) )

-        return FALSE;
+        return false;

 
     // TODO use visibilityChanged Carbon Event for OSX
     if ( m_peer )
 
     // TODO use visibilityChanged Carbon Event for OSX
     if ( m_peer )

-    {

         m_peer->SetVisibility( show , true ) ;
         m_peer->SetVisibility( show , true ) ;

-    }
+

     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;
     if ( former != MacIsReallyShown() )
         MacPropagateVisibilityChanged() ;

-    return TRUE;
+    return true;

 }
 
 bool wxWindowMac::Enable(bool enable)
 }
 
 bool wxWindowMac::Enable(bool enable)


@@ -1957,13 +1963,14 @@ bool wxWindowMac::Enable(bool enable)
     wxASSERT( m_peer->Ok() ) ;
     bool former = MacIsReallyEnabled() ;
     if ( !wxWindowBase::Enable(enable) )
     wxASSERT( m_peer->Ok() ) ;
     bool former = MacIsReallyEnabled() ;
     if ( !wxWindowBase::Enable(enable) )

-        return FALSE;
+        return false;

 
     m_peer->Enable( enable ) ;
 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;
 
     m_peer->Enable( enable ) ;
 
     if ( former != MacIsReallyEnabled() )
         MacPropagateEnabledStateChanged() ;

-    return TRUE;
+
+    return true;

 }
 
 //
 }
 
 //


@@ -1975,44 +1982,50 @@ void wxWindowMac::MacPropagateVisibilityChanged()
 #if !TARGET_API_MAC_OSX
     MacVisibilityChanged() ;
 
 #if !TARGET_API_MAC_OSX
     MacVisibilityChanged() ;
 

+    wxWindowMac *child;

     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         if ( child->IsShown() )
         if ( child->IsShown() )

-            child->MacPropagateVisibilityChanged(  ) ;
+            child->MacPropagateVisibilityChanged() ;
+

         node = node->GetNext();
     }
 #endif
 }
 
         node = node->GetNext();
     }
 #endif
 }
 

-void wxWindowMac::MacPropagateEnabledStateChanged( )
+void wxWindowMac::MacPropagateEnabledStateChanged()

 {
 #if !TARGET_API_MAC_OSX
     MacEnabledStateChanged() ;
 
 {
 #if !TARGET_API_MAC_OSX
     MacEnabledStateChanged() ;
 

+    wxWindowMac *child;

     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         if ( child->IsEnabled() )
             child->MacPropagateEnabledStateChanged() ;
         if ( child->IsEnabled() )
             child->MacPropagateEnabledStateChanged() ;

+

         node = node->GetNext();
     }
 #endif
 }
 
         node = node->GetNext();
     }
 #endif
 }
 

-void wxWindowMac::MacPropagateHiliteChanged( )
+void wxWindowMac::MacPropagateHiliteChanged()

 {
 #if !TARGET_API_MAC_OSX
     MacHiliteChanged() ;
 
 {
 #if !TARGET_API_MAC_OSX
     MacHiliteChanged() ;
 

+    wxWindowMac *child;

     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         // if ( child->IsEnabled() )
             child->MacPropagateHiliteChanged() ;
         // if ( child->IsEnabled() )
             child->MacPropagateHiliteChanged() ;

+

         node = node->GetNext();
     }
 #endif
         node = node->GetNext();
     }
 #endif


@@ -2043,13 +2056,14 @@ bool wxWindowMac::MacIsReallyShown()
     // only under OSX the visibility of the TLW is taken into account
     if ( m_isBeingDeleted )
         return false ;
     // only under OSX the visibility of the TLW is taken into account
     if ( m_isBeingDeleted )
         return false ;

-        
+

 #if TARGET_API_MAC_OSX
     if ( m_peer && m_peer->Ok() )
         return m_peer->IsVisible();
 #endif
 #if TARGET_API_MAC_OSX
     if ( m_peer && m_peer->Ok() )
         return m_peer->IsVisible();
 #endif

+

     wxWindow* win = this ;
     wxWindow* win = this ;

-    while( win->IsShown()  )
+    while ( win->IsShown()  )

     {
         if ( win->IsTopLevel() )
             return true ;
     {
         if ( win->IsTopLevel() )
             return true ;


@@ -2057,8 +2071,8 @@ bool wxWindowMac::MacIsReallyShown()
         win = win->GetParent() ;
         if ( win == NULL )
             return true ;
         win = win->GetParent() ;
         if ( win == NULL )
             return true ;

+    }

 
 

-    } ;

     return false ;
 }
 
     return false ;
 }
 


@@ -2079,19 +2093,17 @@ void wxWindowMac::MacFlashInvalidAreas()
 #endif
 }
 
 #endif
 }
 

-//
-//
-//
-

 int wxWindowMac::GetCharHeight() const
 {
 int wxWindowMac::GetCharHeight() const
 {

-    wxClientDC dc ( (wxWindowMac*)this ) ;
+    wxClientDC dc( (wxWindowMac*)this ) ;
+

     return dc.GetCharHeight() ;
 }
 
 int wxWindowMac::GetCharWidth() const
 {
     return dc.GetCharHeight() ;
 }
 
 int wxWindowMac::GetCharWidth() const
 {

-    wxClientDC dc ( (wxWindowMac*)this ) ;
+    wxClientDC dc( (wxWindowMac*)this ) ;
+

     return dc.GetCharWidth() ;
 }
 
     return dc.GetCharWidth() ;
 }
 


@@ -2151,7 +2163,6 @@ void wxWindowMac::Freeze()
 #endif
 }
 
 #endif
 }
 

-

 void wxWindowMac::Thaw()
 {
 #if TARGET_API_MAC_OSX
 void wxWindowMac::Thaw()
 {
 #if TARGET_API_MAC_OSX


@@ -2182,6 +2193,8 @@ void wxWindowMac::WarpPointer (int x_pos, int y_pos)
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
 
 void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {

+    if ( MacGetTopLevelWindow() == NULL )
+        return ;

 #if TARGET_API_MAC_OSX
     if ( MacGetTopLevelWindow()->MacUsesCompositing() && (m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) )
     {
 #if TARGET_API_MAC_OSX
     if ( MacGetTopLevelWindow()->MacUsesCompositing() && (m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) )
     {


@@ -2211,6 +2224,7 @@ int wxWindowMac::GetScrollPos(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbPosition() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -2228,6 +2242,7 @@ int wxWindowMac::GetScrollRange(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -2243,6 +2258,7 @@ int wxWindowMac::GetScrollThumb(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }

+

     return 0;
 }
 
     return 0;
 }
 


@@ -2267,26 +2283,26 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
 
 void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
 {
 
 void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
 {

-    if( IsTopLevel() )
+    if ( IsTopLevel() )

         return ;
 
     Rect rect ;
     bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
         return ;
 
     Rect rect ;
     bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;

-    bool hasBothScrollbars = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+    bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ;

 
     m_peer->GetRect( &rect ) ;
     // back to the surrounding frame rectangle
     InsetRect( &rect, -1 , -1 ) ;
 
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
 
     m_peer->GetRect( &rect ) ;
     // back to the surrounding frame rectangle
     InsetRect( &rect, -1 , -1 ) ;
 
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3

-    if ( UMAGetSystemVersion() >= 0x1030  )
+    if ( UMAGetSystemVersion() >= 0x1030 )

     {
         CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
             rect.bottom - rect.top ) ;
 
         HIThemeFrameDrawInfo info ;
         memset( &info, 0 , sizeof( info ) ) ;
     {
         CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
             rect.bottom - rect.top ) ;
 
         HIThemeFrameDrawInfo info ;
         memset( &info, 0 , sizeof( info ) ) ;

-        
+

         info.version = 0 ;
         info.kind = 0 ;
         info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
         info.version = 0 ;
         info.kind = 0 ;
         info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;


@@ -2294,13 +2310,13 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;

-         
-        if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+
+        if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )

         {
             info.kind = kHIThemeFrameTextFieldSquare ;
             HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
         }
         {
             info.kind = kHIThemeFrameTextFieldSquare ;
             HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
         }

-        else if (HasFlag(wxSIMPLE_BORDER))
+        else if ( HasFlag(wxSIMPLE_BORDER) )

         {
             info.kind = kHIThemeFrameListBox ;
             HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
         {
             info.kind = kHIThemeFrameListBox ;
             HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;


@@ -2309,15 +2325,15 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }
         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }

-        
+

         m_peer->GetRect( &rect ) ;
         if ( hasBothScrollbars )
         {
             int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ;
             CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
             CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
         m_peer->GetRect( &rect ) ;
         if ( hasBothScrollbars )
         {
             int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ;
             CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
             CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;

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

             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
             info.kind = kHIThemeGrowBoxKindNone ;
             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
             info.kind = kHIThemeGrowBoxKindNone ;


@@ -2330,31 +2346,25 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
 #endif
     {
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();
 #endif
     {
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();

-        if (top )
+        if ( top )

         {
         {

-            wxPoint pt(0,0) ;
+            wxPoint pt(0, 0) ;

             wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
             OffsetRect( &rect , pt.x , pt.y ) ;
         }
 
             wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
             OffsetRect( &rect , pt.x , pt.y ) ;
         }
 

-        if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
-        {
-            DrawThemeEditTextFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        }
-        else if (HasFlag(wxSIMPLE_BORDER))
-        {
-            DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-        }
-        
+        if ( HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+            DrawThemeEditTextFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+        else if ( HasFlag(wxSIMPLE_BORDER) )
+            DrawThemeListBoxFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+

         if ( hasFocus )
         if ( hasFocus )

-        {

             DrawThemeFocusRect( &rect , true ) ;
             DrawThemeFocusRect( &rect , true ) ;

-        }

 
         if ( hasBothScrollbars )
         {
 
         if ( hasBothScrollbars )
         {

-            // GetThemeStandaloneGrowBoxBounds    
-                        //DrawThemeStandaloneNoGrowBox
+            // GetThemeStandaloneGrowBoxBounds
+            // DrawThemeStandaloneNoGrowBox

         }
     }
 }
         }
     }
 }


@@ -2387,6 +2397,7 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
                 if ( !m_hScrollBar->IsShown() )
                     m_hScrollBar->Show(true) ;
             }
                 if ( !m_hScrollBar->IsShown() )
                     m_hScrollBar->Show(true) ;
             }

+

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


@@ -2404,31 +2415,33 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
                 if ( !m_vScrollBar->IsShown() )
                     m_vScrollBar->Show(true) ;
             }
                 if ( !m_vScrollBar->IsShown() )
                     m_vScrollBar->Show(true) ;
             }

+

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

+

     MacRepositionScrollBars() ;
 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     MacRepositionScrollBars() ;
 }
 
 // Does a physical scroll
 void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 {

-    if( dx == 0 && dy ==0 )
+    if ( dx == 0 && dy ==0 )

         return ;
 
         return ;
 

-        int width , height ;
-        GetClientSize( &width , &height ) ;
+    int width , height ;
+    GetClientSize( &width , &height ) ;
+

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-       if ( 1 /* m_peer->IsCompositing() */ )
-       {
+    if ( true /* m_peer->IsCompositing() */ )
+    {

         // 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
         wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize()  , width , height ) ;
         if ( 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,
         // TODO write optimal workaround
         wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize()  , width , height ) ;
         if ( rect )

-        {

             scrollrect.Intersect( *rect ) ;
             scrollrect.Intersect( *rect ) ;

-        }
+

         if ( m_peer->GetNeedsDisplay() )
         {
             // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
         if ( m_peer->GetNeedsDisplay() )
         {
             // becuase HIViewScrollRect does not scroll the already invalidated area we have two options


@@ -2440,13 +2453,14 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             // this would be the preferred version for fast drawing controls
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
             // this would be the preferred version for fast drawing controls
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3

-            if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+            if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )

                 HIViewRender(m_peer->GetControlRef()) ;
             else
 #endif
                 Update() ;
 #endif
         }
                 HIViewRender(m_peer->GetControlRef()) ;
             else
 #endif
                 Update() ;
 #endif
         }

+

         // as the native control might be not a 0/0 wx window coordinates, we have to offset
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
         m_peer->ScrollRect( (&scrollrect) , dx , dy ) ;
         // as the native control might be not a 0/0 wx window coordinates, we have to offset
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
         m_peer->ScrollRect( (&scrollrect) , dx , dy ) ;


@@ -2457,20 +2471,20 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         // is the better overall solution, as it does not slow down scrolling
         m_peer->SetNeedsDisplay() ;
 #else
         // is the better overall solution, as it does not slow down scrolling
         m_peer->SetNeedsDisplay() ;
 #else

-        // this would be the preferred version for fast drawing controls       
+        // this would be the preferred version for fast drawing controls

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3

-            if( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+            if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )

                 HIViewRender(m_peer->GetControlRef()) ;
             else
 #endif
                 HIViewRender(m_peer->GetControlRef()) ;
             else
 #endif

-                Update() ;                
+                Update() ;

 
 #endif
 
 #endif

-       }
-       else
+    }
+    else

 #endif
 #endif

-       {
+    {

 
         wxPoint pos;
         pos.x = pos.y = 0;
 
         wxPoint pos;
         pos.x = pos.y = 0;


@@ -2478,7 +2492,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 
         Rect scrollrect;
         RgnHandle updateRgn = NewRgn() ;
 

-       {
+        {

             wxClientDC dc(this) ;
             wxMacPortSetter helper(&dc) ;
 
             wxClientDC dc(this) ;
             wxMacPortSetter helper(&dc) ;
 


@@ -2494,10 +2508,10 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
                     dc.XLOG2DEVMAC(rect->x + rect->width) } ;
                 SectRect( &scrollrect , &r , &scrollrect ) ;
             }
                     dc.XLOG2DEVMAC(rect->x + rect->width) } ;
                 SectRect( &scrollrect , &r , &scrollrect ) ;
             }

+

             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
 
             // now scroll the former update region as well and add the new update region
             ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
 
             // now scroll the former update region as well and add the new update region

-            

             WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
             RgnHandle formerUpdateRgn = NewRgn() ;
             RgnHandle scrollRgn = NewRgn() ;
             WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
             RgnHandle formerUpdateRgn = NewRgn() ;
             RgnHandle scrollRgn = NewRgn() ;


@@ -2507,45 +2521,53 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
             LocalToGlobal( &pt ) ;
             OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
             SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
             LocalToGlobal( &pt ) ;
             OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
             SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;

+

             if ( !EmptyRgn( formerUpdateRgn ) )
             {
                 MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
                 SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
             if ( !EmptyRgn( formerUpdateRgn ) )
             {
                 MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
                 SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;

-                InvalWindowRgn(rootWindow  ,  formerUpdateRgn ) ;
+                InvalWindowRgn( rootWindow,  formerUpdateRgn ) ;

             }
             }

+

             InvalWindowRgn(rootWindow  ,  updateRgn ) ;
             DisposeRgn( updateRgn ) ;
             DisposeRgn( formerUpdateRgn ) ;
             DisposeRgn( scrollRgn ) ;
         }
             InvalWindowRgn(rootWindow  ,  updateRgn ) ;
             DisposeRgn( updateRgn ) ;
             DisposeRgn( formerUpdateRgn ) ;
             DisposeRgn( scrollRgn ) ;
         }

+

         Update() ;
     }
 
         Update() ;
     }
 

+    wxWindowMac *child;
+    int x, y, w, h;

     for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
     {
     for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
     {

-        wxWindowMac *child = node->GetData();
-        if (child == m_vScrollBar) continue;
-        if (child == m_hScrollBar) continue;
-        if (child->IsTopLevel()) continue;
+        child = node->GetData();
+        if (child == NULL)
+            continue;
+        if (child == m_vScrollBar)
+            continue;
+        if (child == m_hScrollBar)
+            continue;
+        if (child->IsTopLevel())
+            continue;

 
 

-        int x,y;

         child->GetPosition( &x, &y );
         child->GetPosition( &x, &y );

-        int w,h;

         child->GetSize( &w, &h );
         if (rect)
         {
         child->GetSize( &w, &h );
         if (rect)
         {

-            wxRect rc(x,y,w,h);
-            if (rect->Intersects(rc))
-                child->SetSize( x+dx, y+dy, w, h );
+            wxRect rc( x, y, w, h );
+            if (rect->Intersects( rc ))
+                child->SetSize( x + dx, y + dy, w, h );

         }
         else
         {
         }
         else
         {

-            child->SetSize( x+dx, y+dy, w, h );
+            child->SetSize( x + dx, y + dy, w, h );

         }
     }
 }
 
         }
     }
 }
 

-void wxWindowMac::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll( wxScrollEvent &event )

 {
     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {
 {
     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {


@@ -2583,30 +2605,43 @@ wxWindowMac *wxWindowBase::DoFindFocus()
     return wxFindControlFromMacControl( control ) ;
 }
 
     return wxFindControlFromMacControl( control ) ;
 }
 

-void wxWindowMac::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus( wxFocusEvent& event )

 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
     //
 {
     // panel wants to track the window which was the last to have focus in it,
     // so we want to set ourselves as the window which last had focus
     //

-    // notice that it's also important to do it upwards the tree becaus
+    // notice that it's also important to do it upwards the tree because

     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
 
     // otherwise when the top level panel gets focus, it won't set it back to
     // us, but to some other sibling
 

-    // CS:don't know if this is still needed:
+    // CS: don't know if this is still needed:

     //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 ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
     {

- #if !wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS
+        GetParent()->Refresh() ;
+#else

         wxMacWindowStateSaver sv( this ) ;
         Rect rect ;
         wxMacWindowStateSaver sv( this ) ;
         Rect rect ;

+

         m_peer->GetRect( &rect ) ;
         // auf den umgebenden Rahmen zur\9fck
         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();
         m_peer->GetRect( &rect ) ;
         // auf den umgebenden Rahmen zur\9fck
         InsetRect( &rect, -1 , -1 ) ;
 
         wxTopLevelWindowMac* top = MacGetTopLevelWindow();

-        if (top )
+        if ( top )

         {
             wxPoint pt(0,0) ;
             wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
         {
             wxPoint pt(0,0) ;
             wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;


@@ -2616,19 +2651,14 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event)
             rect.bottom += pt.y ;
         }
 
             rect.bottom += pt.y ;
         }
 

-        if ( event.GetEventType() == wxEVT_SET_FOCUS )
-            DrawThemeFocusRect( &rect , true ) ;
-        else
+        DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
+        if ( !bIsFocusEvent )

         {
         {

-            DrawThemeFocusRect( &rect , false ) ;
-

             // as this erases part of the frame we have to redraw borders
             // and because our z-ordering is not always correct (staticboxes)
             // we have to invalidate things, we cannot simple redraw
             MacInvalidateBorders() ;
         }
             // as this erases part of the frame we have to redraw borders
             // and because our z-ordering is not always correct (staticboxes)
             // we have to invalidate things, we cannot simple redraw
             MacInvalidateBorders() ;
         }

-#else
-        GetParent()->Refresh() ;

 #endif
     }
 
 #endif
     }
 


@@ -2655,10 +2685,9 @@ void wxWindowMac::Lower()
     m_peer->SetZOrder( false , NULL ) ;
 }
 
     m_peer->SetZOrder( false , NULL ) ;
 }
 

-

 // static wxWindow *gs_lastWhich = NULL;
 
 // static wxWindow *gs_lastWhich = NULL;
 

-bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt )

 {
     // first trigger a set cursor event
 
 {
     // first trigger a set cursor event
 


@@ -2676,27 +2705,21 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
         }
         else
         {
         }
         else
         {

-

             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             if ( !processedEvtSetCursor && m_cursor.Ok() )
             // the test for processedEvtSetCursor is here to prevent using m_cursor
             // if the user code caught EVT_SET_CURSOR() and returned nothing from
             // it - this is a way to say that our cursor shouldn't be used for this
             // point
             if ( !processedEvtSetCursor && m_cursor.Ok() )

-            {

                 cursor = m_cursor ;
                 cursor = m_cursor ;

-            }
-            if ( wxIsBusy() )
-            {
-            }
-            else
-            {
-                if ( !GetParent() )
-                    cursor = *wxSTANDARD_CURSOR  ;
-            }
+
+            if ( !wxIsBusy() && !GetParent() )
+                cursor = *wxSTANDARD_CURSOR ;

         }
         }

+

         if ( cursor.Ok() )
             cursor.MacInstall() ;
     }
         if ( cursor.Ok() )
             cursor.MacInstall() ;
     }

+

     return cursor.Ok() ;
 }
 
     return cursor.Ok() ;
 }
 


@@ -2704,10 +2727,9 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
 {
 #if wxUSE_TOOLTIPS
     if ( m_tooltip )
 {
 #if wxUSE_TOOLTIPS
     if ( m_tooltip )

-    {

         return m_tooltip->GetTip() ;
         return m_tooltip->GetTip() ;

-    }

 #endif
 #endif

+

     return wxEmptyString ;
 }
 
     return wxEmptyString ;
 }
 


@@ -2731,27 +2753,29 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
     if ( window )
     wxTopLevelWindowMac* win = NULL ;
     WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
     if ( window )

-    {

         win = wxFindWinFromMacWindow( window ) ;
         win = wxFindWinFromMacWindow( window ) ;

-    }
+

     return win ;
 }
 
     return win ;
 }
 

-const wxRect& wxWindowMac::MacGetClippedClientRect() const 
+const wxRect& wxWindowMac::MacGetClippedClientRect() const

 {
     MacUpdateClippedRects() ;
 {
     MacUpdateClippedRects() ;

+

     return m_cachedClippedClientRect ;
 }
 
     return m_cachedClippedClientRect ;
 }
 

-const wxRect& wxWindowMac::MacGetClippedRect() const 
+const wxRect& wxWindowMac::MacGetClippedRect() const

 {
     MacUpdateClippedRects() ;
 {
     MacUpdateClippedRects() ;

+

     return m_cachedClippedRect ;
 }
 
     return m_cachedClippedRect ;
 }
 

-const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const 
+const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const

 {
     MacUpdateClippedRects() ;
 {
     MacUpdateClippedRects() ;

+

     return m_cachedClippedRectWithOuterStructure ;
 }
 
     return m_cachedClippedRectWithOuterStructure ;
 }
 


@@ -2782,9 +2806,8 @@ void wxWindowMac::MacUpdateClippedRects() const
     // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
     // to add focus borders everywhere
 
     // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
     // to add focus borders everywhere
 

-    Rect r ;
-    Rect rIncludingOuterStructures ;
-    
+    Rect r, rIncludingOuterStructures ;
+

     m_peer->GetRect( &r ) ;
     r.left -= MacGetLeftBorderSize() ;
     r.top -= MacGetTopBorderSize() ;
     m_peer->GetRect( &r ) ;
     r.left -= MacGetLeftBorderSize() ;
     r.top -= MacGetTopBorderSize() ;


@@ -2798,17 +2821,16 @@ void wxWindowMac::MacUpdateClippedRects() const
 
     rIncludingOuterStructures = r ;
     InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;
 
     rIncludingOuterStructures = r ;
     InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;

-    
+

     wxRect cl = GetClientRect() ;
     Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
     wxRect cl = GetClientRect() ;
     Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;

-    
+
+    int x , y ;
+    wxSize size ;

     const wxWindow* child = this ;
     const wxWindow* parent = NULL ;
     const wxWindow* child = this ;
     const wxWindow* parent = NULL ;

-    while( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )
+    while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )

     {
     {

-        int x , y ;
-        wxSize size ;
-

         if ( parent->MacIsChildOfClientArea(child) )
         {
             size = parent->GetClientSize() ;
         if ( parent->MacIsChildOfClientArea(child) )
         {
             size = parent->GetClientSize() ;


@@ -2841,21 +2863,22 @@ void wxWindowMac::MacUpdateClippedRects() const
         {
             SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
         }
         {
             SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
         }

+

         child = parent ;
     }
         child = parent ;
     }

-    
+

     m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
     m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;

-    m_cachedClippedClientRect = wxRect( rClient.left , rClient.top , 
+    m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,

         rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
         rClient.right - rClient.left , rClient.bottom - rClient.top ) ;

-    m_cachedClippedRectWithOuterStructure = wxRect( 
-        rIncludingOuterStructures.left , rIncludingOuterStructures.top , 
-        rIncludingOuterStructures.right - rIncludingOuterStructures.left , 
+    m_cachedClippedRectWithOuterStructure = wxRect(
+        rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
+        rIncludingOuterStructures.right - rIncludingOuterStructures.left ,

         rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
         rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;

-    
+

     m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
     m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
     m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
     m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
     m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
     m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;

-    
+

     m_cachedClippedRectValid = true ;
 }
 
     m_cachedClippedRectValid = true ;
 }
 


@@ -2864,19 +2887,19 @@ void wxWindowMac::MacUpdateClippedRects() const
  */
 bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
 {
  */
 bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
 {

-    RgnHandle updatergn = (RgnHandle) updatergnr ;

     bool handled = false ;
     Rect updatebounds ;
     bool handled = false ;
     Rect updatebounds ;

+    RgnHandle updatergn = (RgnHandle) updatergnr ;

     GetRegionBounds( updatergn , &updatebounds ) ;
 
     GetRegionBounds( updatergn , &updatebounds ) ;
 

-    // wxLogDebug(wxT("update for %s bounds %d , %d , %d , %d"),wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+    // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;

 
 

-    if ( !EmptyRgn(updatergn) )  
+    if ( !EmptyRgn(updatergn) )

     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;
     {
         RgnHandle newupdate = NewRgn() ;
         wxSize point = GetClientSize() ;
         wxPoint origin = GetClientAreaOrigin() ;

-        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
+        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;

         SectRgn( newupdate , updatergn , newupdate ) ;
 
         // first send an erase event to the entire update area
         SectRgn( newupdate , updatergn , newupdate ) ;
 
         // first send an erase event to the entire update area


@@ -2890,7 +2913,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
                 dc->SetClippingRegion(wxRegion(updatergn));
             else
                 dc->SetClippingRegion(wxRegion(newupdate));
                 dc->SetClippingRegion(wxRegion(updatergn));
             else
                 dc->SetClippingRegion(wxRegion(newupdate));

-                
+

             wxEraseEvent eevent( GetId(), dc );
             eevent.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eevent );
             wxEraseEvent eevent( GetId(), dc );
             eevent.SetEventObject( this );
             GetEventHandler()->ProcessEvent( eevent );


@@ -2919,19 +2942,25 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
         // in Composited windowing
         wxPoint clientOrigin = GetClientAreaOrigin() ;
 
         // in Composited windowing
         wxPoint clientOrigin = GetClientAreaOrigin() ;
 

+        wxWindowMac *child;
+        int x, y, w, h;

         for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
         {
         for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
         {

-            wxWindowMac *child = node->GetData();
-            if (child == m_vScrollBar) continue;
-            if (child == m_hScrollBar) continue;
-            if (child->IsTopLevel()) continue;
-            if (!child->IsShown()) continue;
+            child = node->GetData();
+            if (child == NULL)
+                continue;
+            if (child == m_vScrollBar)
+                continue;
+            if (child == m_hScrollBar)
+                continue;
+            if (child->IsTopLevel())
+                continue;
+            if (!child->IsShown())
+                continue;

 
             // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
 
 
             // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
 

-            int x,y;

             child->GetPosition( &x, &y );
             child->GetPosition( &x, &y );

-            int w,h;

             child->GetSize( &w, &h );
             Rect childRect = { y , x , y + h , x + w } ;
             OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
             child->GetSize( &w, &h );
             Rect childRect = { y , x , y + h , x + w } ;
             OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;


@@ -2939,7 +2968,6 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
 
             if ( RectInRgn( &childRect , updatergn ) )
             {
 
             if ( RectInRgn( &childRect , updatergn ) )
             {

-

                 // paint custom borders
                 wxNcPaintEvent eventNc( child->GetId() );
                 eventNc.SetEventObject( child );
                 // paint custom borders
                 wxNcPaintEvent eventNc( child->GetId() );
                 eventNc.SetEventObject( child );


@@ -2948,7 +2976,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
                     if ( UMAGetSystemVersion() >= 0x1030 )
                     {
 #if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
                     if ( UMAGetSystemVersion() >= 0x1030 )
                     {

-                        child->MacPaintBorders(0,0) ;
+                        child->MacPaintBorders(0, 0) ;

                     }
                     else
 #endif
                     }
                     else
 #endif


@@ -2956,12 +2984,13 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
                         wxWindowDC dc(this) ;
                         dc.SetClippingRegion(wxRegion(updatergn));
                         wxMacPortSetter helper(&dc) ;
                         wxWindowDC dc(this) ;
                         dc.SetClippingRegion(wxRegion(updatergn));
                         wxMacPortSetter helper(&dc) ;

-                        child->MacPaintBorders(0,0)  ;
+                        child->MacPaintBorders(0, 0)  ;

                     }
                 }
             }
         }
     }
                     }
                 }
             }
         }
     }

+

     return handled ;
 }
 
     return handled ;
 }
 


@@ -2970,14 +2999,16 @@ WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 
 {
     wxWindowMac *iter = (wxWindowMac*)this ;
 

-    while( iter )
+    while ( iter )

     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     }
     {
         if ( iter->IsTopLevel() )
             return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
 
         iter = iter->GetParent() ;
     }

+

     wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
     wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;

+

     return NULL ;
 }
 
     return NULL ;
 }
 


@@ -3005,23 +3036,16 @@ void wxWindowMac::MacCreateScrollBars( long style )
         wxPoint hPoint(0 , height-scrlsize ) ;
         wxSize hSize( width - adjust, scrlsize) ;
 
         wxPoint hPoint(0 , height-scrlsize ) ;
         wxSize hSize( width - adjust, scrlsize) ;
 

-

         if ( style & wxVSCROLL )
         if ( style & wxVSCROLL )

-        {
-            m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint,
-                vSize , wxVERTICAL);
-        }
+            m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);

 
         if ( style  & wxHSCROLL )
 
         if ( style  & wxHSCROLL )

-        {
-            m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint,
-                hSize , wxHORIZONTAL);
-        }
+            m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);

     }
 
     }
 

-

     // because the create does not take into account the client area origin
     // because the create does not take into account the client area origin

-    MacRepositionScrollBars() ; // we might have a real position shift
+    // we might have a real position shift
+    MacRepositionScrollBars() ;

 }
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
 }
 
 bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const


@@ -3037,28 +3061,24 @@ void wxWindowMac::MacRepositionScrollBars()
     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 
     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 

-    bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+    bool hasBoth = (m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;

     int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
     int adjust = hasBoth ? scrlsize - 1 : 0 ;
 
     // get real client area
     int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
     int adjust = hasBoth ? scrlsize - 1 : 0 ;
 
     // get real client area

-
-    int width  ;
-    int height  ;
-    GetSize( &width , &height ) ;
+    int width, height ;
+    GetSize( &width , &height );

 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
 
 
     width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
     height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
 

-    wxPoint vPoint(width-scrlsize, 0) ;
-    wxSize vSize(scrlsize, height - adjust) ;
-    wxPoint hPoint(0 , height-scrlsize ) ;
-    wxSize hSize( width - adjust, scrlsize) ;
-/*
-    int x = 0 ;
-    int y = 0 ;
-    int w ;
-    int h ;
+    wxPoint vPoint( width - scrlsize, 0 ) ;
+    wxSize vSize( scrlsize, height - adjust ) ;
+    wxPoint hPoint( 0 , height - scrlsize ) ;
+    wxSize hSize( width - adjust, scrlsize ) ;
+
+#if 0
+    int x = 0, y = 0, w, h ;

     GetSize( &w , &h ) ;
 
     MacClientToRootWindow( &x , &y ) ;
     GetSize( &w , &h ) ;
 
     MacClientToRootWindow( &x , &y ) ;


@@ -3067,7 +3087,7 @@ void wxWindowMac::MacRepositionScrollBars()
     wxWindowMac *iter = (wxWindowMac*)this ;
 
     int totW = 10000 , totH = 10000;
     wxWindowMac *iter = (wxWindowMac*)this ;
 
     int totW = 10000 , totH = 10000;

-    while( iter )
+    while ( iter )

     {
         if ( iter->IsTopLevel() )
         {
     {
         if ( iter->IsTopLevel() )
         {


@@ -3089,26 +3109,22 @@ void wxWindowMac::MacRepositionScrollBars()
         vSize.y += 1 ;
     }
 
         vSize.y += 1 ;
     }
 

-    if ( w-x >= totW )
+    if ( w - x >= totW )

     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }
     {
         hSize.x += 1 ;
         vPoint.x += 1 ;
     }

-
-    if ( h-y >= totH )
+    if ( h - y >= totH )

     {
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }
     {
         vSize.y += 1 ;
         hPoint.y += 1 ;
     }

-*/
+#endif
+

     if ( m_vScrollBar )
     if ( m_vScrollBar )

-    {
-        m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
-    }
+        m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );

     if ( m_hScrollBar )
     if ( m_hScrollBar )

-    {
-        m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
-    }
+        m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );

 }
 
 bool wxWindowMac::AcceptsFocus() const
 }
 
 bool wxWindowMac::AcceptsFocus() const


@@ -3118,14 +3134,17 @@ bool wxWindowMac::AcceptsFocus() const
 
 void wxWindowMac::MacSuperChangedPosition()
 {
 
 void wxWindowMac::MacSuperChangedPosition()
 {

-    m_cachedClippedRectValid = false ;

     // only window-absolute structures have to be moved i.e. controls
 
     // only window-absolute structures have to be moved i.e. controls
 

+    m_cachedClippedRectValid = false ;
+
+    wxWindowMac *child;

     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         child->MacSuperChangedPosition() ;
         child->MacSuperChangedPosition() ;

+

         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }


@@ -3134,23 +3153,25 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 
 {
     // only screen-absolute structures have to be moved i.e. glcanvas
 

+    wxWindowMac *child;

     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
     while ( node )
     {

-        wxWindowMac *child = node->GetData();
+        child = node->GetData();

         child->MacTopLevelWindowChangedPosition() ;
         child->MacTopLevelWindowChangedPosition() ;

+

         node = node->GetNext();
     }
 }
 
         node = node->GetNext();
     }
 }
 

-long wxWindowMac::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize() const

 {
 {

-    if( IsTopLevel() )
+    if ( IsTopLevel() )

         return 0 ;
 
     SInt32 border = 0 ;
         return 0 ;
 
     SInt32 border = 0 ;

-    
-    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+
+    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))

     {
         GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
         border += 1 ; // the metric above 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


@@ -3160,22 +3181,23 @@ long wxWindowMac::MacGetLeftBorderSize( ) const
         GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
         border += 1 ; // the metric above 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
     }

+

     return border ;
 }
 
     return border ;
 }
 

-long wxWindowMac::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 }
 

-long wxWindowMac::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize() const

 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;
 {
     // they are all symmetric in mac themes
     return MacGetLeftBorderSize() ;


@@ -3188,10 +3210,11 @@ long wxWindowMac::MacRemoveBordersFromStyle( long style )
 
 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.
 
 // Find the wxWindowMac at the current mouse position, returning the mouse
 // position.

-wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac * wxFindWindowAtPointer( wxPoint& pt )

 {
     pt = wxGetMousePosition();
     wxWindowMac* found = wxFindWindowAtPoint(pt);
 {
     pt = wxGetMousePosition();
     wxWindowMac* found = wxFindWindowAtPoint(pt);

+

     return found;
 }
 
     return found;
 }
 


@@ -3199,7 +3222,9 @@ wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
 wxPoint wxGetMousePosition()
 {
     int x, y;
 wxPoint wxGetMousePosition()
 {
     int x, y;

-    wxGetMousePosition(& x, & y);
+
+    wxGetMousePosition( &x, &y );
+

     return wxPoint(x, y);
 }
 
     return wxPoint(x, y);
 }
 


@@ -3229,9 +3254,9 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
 void wxWindowMac::OnPaint( wxPaintEvent & event )
 {
     if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
 void wxWindowMac::OnPaint( wxPaintEvent & event )
 {
     if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )

-    {
-        CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
-    }
+        CallNextEventHandler(
+            (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
+            (EventRef) wxTheApp->MacGetCurrentEvent() ) ;

 }
 
 void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
 }
 
 void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )


@@ -3240,10 +3265,11 @@ void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart
 
 Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {
 
 Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
 {

-    int x ,y , w ,h ;
+    int x, y, w, h ;

 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ;
 
     window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ;

-    Rect bounds =  { y , x , y+h , x+w  };
+    Rect bounds =  { y, x, y + h, x + w };
+

     return bounds ;
 }
 
     return bounds ;
 }
 


@@ -3252,4 +3278,19 @@ wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
     return eventNotHandledErr ;
 }
 
     return eventNotHandledErr ;
 }
 

+bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
+{
+    wxWindowMac *newParent = (wxWindowMac *)newParentBase;
+
+    if ( !wxWindowBase::Reparent(newParent) )
+        return false;
+
+    // copied from MacPostControlCreate
+    ControlRef container = (ControlRef) GetParent()->GetHandle() ;

 
 

+    wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+
+    ::EmbedControl( m_peer->GetControlRef() , container ) ;
+
+    return true;
+}