wxSplitterWindow mouse capture improvements and cleanup.

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index ebec85144e22944b258701de7a433a3cf11b0437..42c94ae66048d011bb973f4c18d3271dd01b30cf 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -67,9 +67,11 @@
 #include "wx/osx/uma.h"
 #else
 #include "wx/osx/private.h"
 #include "wx/osx/uma.h"
 #else
 #include "wx/osx/private.h"

+#if wxOSX_USE_COCOA

 // bring in themeing
 #include <Carbon/Carbon.h>
 #endif
 // bring in themeing
 #include <Carbon/Carbon.h>
 #endif

+#endif

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


@@ -83,9 +85,6 @@
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
 #endif
 
 BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)

-    EVT_NC_PAINT(wxWindowMac::OnNcPaint)
-    EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
-    EVT_PAINT(wxWindowMac::OnPaint)

     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
 END_EVENT_TABLE()
 


@@ -141,8 +140,6 @@ wxWindowMac::~wxWindowMac()
 {
     SendDestroyEvent();
 
 {
     SendDestroyEvent();
 

-    m_isBeingDeleted = true;
-

     MacInvalidateBorders() ;
 
 #ifndef __WXUNIVERSAL__
     MacInvalidateBorders() ;
 
 #ifndef __WXUNIVERSAL__


@@ -153,7 +150,7 @@ wxWindowMac::~wxWindowMac()
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )
         if ( frame )
         {
             if ( frame->GetLastFocus() == this )

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

             break;
         }
     }
             break;
         }
     }


@@ -198,13 +195,11 @@ wxWindowMac::~wxWindowMac()
 
 WXWidget wxWindowMac::GetHandle() const
 {
 
 WXWidget wxWindowMac::GetHandle() const
 {

-    return (WXWidget) m_peer->GetWXWidget() ;
+    if ( m_peer )
+        return (WXWidget) m_peer->GetWXWidget() ;
+    return NULL;

 }
 
 }
 

-//
-// TODO END move to window_osx.cpp
-//
-

 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Utility Routines to move between different coordinate systems
 // ---------------------------------------------------------------------------


@@ -249,7 +244,11 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them
 
 #ifndef __WXUNIVERSAL__
     // Don't give scrollbars to wxControls unless they ask for them

-    if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+    if ( (! IsKindOf(CLASSINFO(wxControl)) 
+#if wxUSE_STATUSBAR
+        && ! IsKindOf(CLASSINFO(wxStatusBar))
+#endif
+        )

          || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
     {
         MacCreateScrollBars( style ) ;
          || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
     {
         MacCreateScrollBars( style ) ;


@@ -264,10 +263,12 @@ bool wxWindowMac::Create(wxWindowMac *parent,
 
 void wxWindowMac::MacChildAdded()
 {
 
 void wxWindowMac::MacChildAdded()
 {

+#if wxUSE_SCROLLBAR

     if ( m_vScrollBar )
         m_vScrollBar->Raise() ;
     if ( m_hScrollBar )
         m_hScrollBar->Raise() ;
     if ( m_vScrollBar )
         m_vScrollBar->Raise() ;
     if ( m_hScrollBar )
         m_hScrollBar->Raise() ;

+#endif

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


@@ -305,12 +306,8 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
         return;
 
     m_peer->SetControlSize( variant );
         return;
 
     m_peer->SetControlSize( variant );

-#if wxOSX_USE_COCOA_OR_CARBON
-    wxFont font ;
-

 #if wxOSX_USE_CARBON
     ControlSize size ;
 #if wxOSX_USE_CARBON
     ControlSize size ;

-    ThemeFontID themeFont = kThemeSystemFont ;

 
     // we will get that from the settings later
     // and make this NORMAL later, but first
 
     // we will get that from the settings later
     // and make this NORMAL later, but first


@@ -320,61 +317,58 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
             size = kControlSizeNormal;
     {
         case wxWINDOW_VARIANT_NORMAL :
             size = kControlSizeNormal;

-            themeFont = kThemeSystemFont ;

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

-            themeFont = kThemeSmallSystemFont ;

             break ;
 
         case wxWINDOW_VARIANT_MINI :
             // not always defined in the headers
             size = 3 ;
             break ;
 
         case wxWINDOW_VARIANT_MINI :
             // not always defined in the headers
             size = 3 ;

-            themeFont = 109 ;

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

-            themeFont = kThemeSystemFont ;

             break ;
 
         default:
             break ;
 
         default:

-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));

             break ;
     }
             break ;
     }

-

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

-    font.MacCreateFromThemeFont( themeFont ) ;
-#else
-    CTFontUIFontType themeFont = kCTFontSystemFontType ;
+#endif
+
+    wxFont font ;
+
+    wxOSXSystemFont systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
+

     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :
     switch ( variant )
     {
         case wxWINDOW_VARIANT_NORMAL :

-            themeFont = kCTFontSystemFontType;
+            systemFont = wxOSX_SYSTEM_FONT_NORMAL ;

             break ;
 
         case wxWINDOW_VARIANT_SMALL :
             break ;
 
         case wxWINDOW_VARIANT_SMALL :

-            themeFont = kCTFontSmallSystemFontType;
+            systemFont = wxOSX_SYSTEM_FONT_SMALL ;

             break ;
 
         case wxWINDOW_VARIANT_MINI :
             break ;
 
         case wxWINDOW_VARIANT_MINI :

-            themeFont = kCTFontMiniSystemFontType;
+            systemFont = wxOSX_SYSTEM_FONT_MINI ;

             break ;
 
         case wxWINDOW_VARIANT_LARGE :
             break ;
 
         case wxWINDOW_VARIANT_LARGE :

-            themeFont = kCTFontSystemFontType;
+            systemFont = wxOSX_SYSTEM_FONT_NORMAL ;

             break ;
 
         default:
             break ;
 
         default:

-            wxFAIL_MSG(_T("unexpected window variant"));
+            wxFAIL_MSG(wxT("unexpected window variant"));

             break ;
     }
             break ;
     }

-    font.MacCreateFromUIFont( themeFont ) ;
-#endif
+
+    font.CreateSystemFont( systemFont ) ;

 
     SetFont( font ) ;
 
     SetFont( font ) ;

-#endif

 }
 
 void wxWindowMac::MacUpdateControlFont()
 }
 
 void wxWindowMac::MacUpdateControlFont()


@@ -417,11 +411,25 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     return true ;
 }
 
     return true ;
 }
 

+static bool wxIsWindowOrParentDisabled(wxWindow* w)
+{
+    while (w && !w->IsTopLevel())
+    {
+        if (!w->IsEnabled())
+            return true;
+        w = w->GetParent();
+    }
+    return false;
+}
+

 void wxWindowMac::SetFocus()
 {
     if ( !AcceptsFocus() )
             return ;
 
 void wxWindowMac::SetFocus()
 {
     if ( !AcceptsFocus() )
             return ;
 

+    if (wxIsWindowOrParentDisabled((wxWindow*) this))
+        return;
+

     wxWindow* former = FindFocus() ;
     if ( former == this )
         return ;
     wxWindow* former = FindFocus() ;
     if ( former == this )
         return ;


@@ -432,6 +440,7 @@ void wxWindowMac::SetFocus()
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;
 void wxWindowMac::DoCaptureMouse()
 {
     wxApp::s_captureWindow = (wxWindow*) this ;

+    m_peer->CaptureMouse() ;

 }
 
 wxWindow * wxWindowBase::GetCapture()
 }
 
 wxWindow * wxWindowBase::GetCapture()


@@ -442,6 +451,8 @@ wxWindow * wxWindowBase::GetCapture()
 void wxWindowMac::DoReleaseMouse()
 {
     wxApp::s_captureWindow = NULL ;
 void wxWindowMac::DoReleaseMouse()
 {
     wxApp::s_captureWindow = NULL ;

+
+    m_peer->ReleaseMouse() ;

 }
 
 #if wxUSE_DRAG_AND_DROP
 }
 
 #if wxUSE_DRAG_AND_DROP


@@ -477,8 +488,8 @@ bool wxWindowMac::MacGetBoundsForControl(
     x = (int)pos.x;
     y = (int)pos.y;
 
     x = (int)pos.x;
     y = (int)pos.y;
 

-    w = WidthDefault( size.x ); 
-    h = HeightDefault( size.y ); 
+    w = WidthDefault( size.x );
+    h = HeightDefault( size.y );

 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;
 
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;


@@ -514,7 +525,7 @@ void wxWindowMac::DoGetSize(int *x, int *y) const
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int x1, y1;
 void wxWindowMac::DoGetPosition(int *x, int *y) const
 {
     int x1, y1;

-    
+

     m_peer->GetPosition( x1, y1 ) ;
 
     // get the wx window position from the native one
     m_peer->GetPosition( x1, y1 ) ;
 
     // get the wx window position from the native one


@@ -643,13 +654,13 @@ wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size )  const
     int innerwidth, innerheight;
     int left, top;
     int outerwidth, outerheight;
     int innerwidth, innerheight;
     int left, top;
     int outerwidth, outerheight;

-    
+

     m_peer->GetContentArea( left, top, innerwidth, innerheight );
     m_peer->GetSize( outerwidth, outerheight );
     m_peer->GetContentArea( left, top, innerwidth, innerheight );
     m_peer->GetSize( outerwidth, outerheight );

-    
-    sizeTotal.x += left + (outerwidth-innerwidth);
-    sizeTotal.y += top + (outerheight-innerheight);
-    
+
+    sizeTotal.x += outerwidth-innerwidth;
+    sizeTotal.y += outerheight-innerheight;
+

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


@@ -662,15 +673,16 @@ void wxWindowMac::DoGetClientSize( int *x, int *y ) const
     int ww, hh;
 
     int left, top;
     int ww, hh;
 
     int left, top;

-    
-    m_peer->GetContentArea( left, top, ww, hh );

 
 

+    m_peer->GetContentArea( left, top, ww, hh );
+#if wxUSE_SCROLLBAR

     if (m_hScrollBar  && m_hScrollBar->IsShown() )
         hh -= m_hScrollBar->GetSize().y ;
 
     if (m_vScrollBar  && m_vScrollBar->IsShown() )
         ww -= m_vScrollBar->GetSize().x ;
 
     if (m_hScrollBar  && m_hScrollBar->IsShown() )
         hh -= m_hScrollBar->GetSize().y ;
 
     if (m_vScrollBar  && m_vScrollBar->IsShown() )
         ww -= m_vScrollBar->GetSize().x ;
 

+#endif

     if (x)
        *x = ww;
     if (y)
     if (x)
        *x = ww;
     if (y)


@@ -696,37 +708,8 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
     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 ;
-#if wxOSX_USE_CARBON
-    {
-        wxNonOwnedWindow *tlw = MacGetTopLevelWindow() ;
-        WindowRef window = (WindowRef) ( tlw ? tlw->GetWXWindow() : 0 ) ;
-
-        ControlPartCode part ;
-        ControlRef control ;
-        Point pt ;
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-        HIPoint hiPoint ;
-        HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
-        pt.h = hiPoint.x;
-        pt.v = hiPoint.y;
- #else
-        GetGlobalMouse( &pt );
-        int x = pt.h;
-        int y = pt.v;
-        ScreenToClient(&x, &y);
-        pt.h = x;
-        pt.v = y;
-#endif
-        control = FindControlUnderMouse( pt , window , &part ) ;
-        if ( control )
-            mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
-
-    }
-#endif
-
-    if ( mouseWin == this && !wxIsBusy() )
-        m_cursor.MacInstall() ;
+    if ( GetPeer() != NULL )
+        GetPeer()->SetCursor( m_cursor );

 
     return true ;
 }
 
     return true ;
 }


@@ -748,30 +731,8 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     {
         ClientToScreen( &x , &y ) ;
     }
     {
         ClientToScreen( &x , &y ) ;
     }

-#ifdef __WXOSX_CARBON__
-    long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
-    if ( HiWord(menuResult) != 0 )
-    {
-        MenuCommand macid;
-        GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
-        int id = wxMacCommandToId( macid );
-        wxMenuItem* item = NULL ;
-        wxMenu* realmenu ;
-        item = menu->FindItem( id, &realmenu ) ;
-        if ( item )
-        {
-            if (item->IsCheckable())
-                item->Check( !item->IsChecked() ) ;
-
-            menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
-        }
-    }
-
-#else
+    menu->GetPeer()->PopUp(this, x, y);

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

-    return false;
-#endif
-

     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation
     return true;
 #else
     // actually this shouldn't be called, because universal is having its own implementation


@@ -806,19 +767,17 @@ void wxWindowMac::MacInvalidateBorders()
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;

-#if wxOSX_USE_CARBON
-    if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
+
+    if ( m_peer->NeedsFocusRect() )

         outerBorder += 4 ;
         outerBorder += 4 ;

-#endif

 
     if ( outerBorder == 0 )
         return ;
 
     // now we know that we have something to do at all
 
     if ( outerBorder == 0 )
         return ;
 
     // now we know that we have something to do at all

-    

 
     int tx,ty,tw,th;
 
     int tx,ty,tw,th;

-    
+

     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 
     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 


@@ -826,7 +785,7 @@ void wxWindowMac::MacInvalidateBorders()
     wxRect rightupdate( tx+tw, ty, outerBorder, th );
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
     wxRect rightupdate( tx+tw, ty, outerBorder, th );
     wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
     wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );

-    
+

     if (GetParent()) {
         GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
         GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
     if (GetParent()) {
         GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
         GetParent()->m_peer->SetNeedsDisplay(&rightupdate);


@@ -857,6 +816,8 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     int actualX = x;
     int actualY = y;
 
     int actualX = x;
     int actualY = y;
 

+#if 0
+    // min and max sizes are only for sizers, not for explicit size setting

     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))
     if ((m_minWidth != -1) && (actualWidth < m_minWidth))
         actualWidth = m_minWidth;
     if ((m_minHeight != -1) && (actualHeight < m_minHeight))


@@ -865,6 +826,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;
         actualWidth = m_maxWidth;
     if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
         actualHeight = m_maxHeight;

+#endif

 
     bool doMove = false, doResize = false ;
 
 
     bool doMove = false, doResize = false ;
 


@@ -890,7 +852,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
         MacInvalidateBorders() ;
 
         m_cachedClippedRectValid = false ;
         MacInvalidateBorders() ;
 
         m_cachedClippedRectValid = false ;

-        
+

         m_peer->Move( bounds.x, bounds.y, bounds.width, bounds.height);
 
         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
         m_peer->Move( bounds.x, bounds.y, bounds.width, bounds.height);
 
         wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified


@@ -926,7 +888,7 @@ wxSize wxWindowMac::DoGetBestSize() const
     else
     {
         wxRect r ;
     else
     {
         wxRect r ;

-        
+

         m_peer->GetBestRect(&r);
 
         if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
         m_peer->GetBestRect(&r);
 
         if ( r.GetWidth() == 0 && r.GetHeight() == 0 )


@@ -936,25 +898,30 @@ wxSize wxWindowMac::DoGetBestSize() const
             r.width =
             r.height = 16 ;
 
             r.width =
             r.height = 16 ;
 

-            if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+            if ( 0 ) 
+            {
+            }
+#if wxUSE_SCROLLBAR
+            else if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )

             {
                 r.height = 16 ;
             }
             {
                 r.height = 16 ;
             }

-    #if wxUSE_SPINBTN
+#endif
+#if wxUSE_SPINBTN

             else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
             {
                 r.height = 24 ;
             }
             else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
             {
                 r.height = 24 ;
             }

-    #endif
+#endif

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

-        int bestWidth = r.width + MacGetLeftBorderSize() + 
+        int bestWidth = r.width + MacGetLeftBorderSize() +

                     MacGetRightBorderSize();
                     MacGetRightBorderSize();

-        int bestHeight = r.height + MacGetTopBorderSize() + 
+        int bestHeight = r.height + MacGetTopBorderSize() +

                      MacGetBottomBorderSize();
         if ( bestHeight < 10 )
             bestHeight = 13 ;
                      MacGetBottomBorderSize();
         if ( bestHeight < 10 )
             bestHeight = 13 ;


@@ -987,6 +954,13 @@ void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 
         // TODO: REMOVE
         MacRepositionScrollBars() ; // we might have a real position shift
 

+        if (sizeFlags & wxSIZE_FORCE_EVENT)
+        {
+            wxSizeEvent event( wxSize(width,height), GetId() );
+            event.SetEventObject( this );
+            HandleWindowEvent( event );
+        }
+

         return;
     }
 
         return;
     }
 


@@ -1059,8 +1033,13 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
 
 void wxWindowMac::SetLabel(const wxString& title)
 {

+    if ( title == m_label )
+        return;
+

     m_label = title ;
 
     m_label = title ;
 

+    InvalidateBestSize();
+

     if ( m_peer && m_peer->IsOk() )
         m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 
     if ( m_peer && m_peer->IsOk() )
         m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
 


@@ -1141,8 +1120,11 @@ int wxWindowMac::GetCharWidth() const
     return width;
 }
 
     return width;
 }
 

-void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
-                           int *descent, int *externalLeading, const wxFont *theFont ) const
+void wxWindowMac::DoGetTextExtent(const wxString& str,
+                                  int *x, int *y,
+                                  int *descent,
+                                  int *externalLeading,
+                                  const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;
 {
     const wxFont *fontToUse = theFont;
     wxFont tempFont;


@@ -1157,9 +1139,9 @@ void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
 
     wxDouble h , d , e , w;
     ctx->GetTextExtent( str, &w, &h, &d, &e );
 
     wxDouble h , d , e , w;
     ctx->GetTextExtent( str, &w, &h, &d, &e );

-    
+

     delete ctx;
     delete ctx;

-    
+

     if ( externalLeading )
         *externalLeading = (wxCoord)(e+0.5);
     if ( descent )
     if ( externalLeading )
         *externalLeading = (wxCoord)(e+0.5);
     if ( descent )


@@ -1182,7 +1164,7 @@ void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
 
     if ( !IsShownOnScreen() )
         return ;
 
     if ( !IsShownOnScreen() )
         return ;

-        
+

     m_peer->SetNeedsDisplay( rect ) ;
 }
 
     m_peer->SetNeedsDisplay( rect ) ;
 }
 


@@ -1217,41 +1199,9 @@ void wxWindowMac::WarpPointer(int WXUNUSED(x_pos), int WXUNUSED(y_pos))
     // We really don't move the mouse programmatically under Mac.
 }
 
     // We really don't move the mouse programmatically under Mac.
 }
 

-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
-{
-    if ( MacGetTopLevelWindow() == NULL )
-        return ;
-/*
-#if TARGET_API_MAC_OSX
-    if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
-    {
-    }
-    else
-#endif
-*/
-    if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
-    {
-        event.GetDC()->Clear() ;
-    }
-    else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
-    {
-        // don't skip the event here, custom background means that the app
-        // is drawing it itself in its OnPaint(), so don't draw it at all
-        // now to avoid flicker
-    }
-    else
-    {
-        event.Skip() ;
-    }
-}
-
-void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
-{
-    event.Skip() ;
-}
-

 int wxWindowMac::GetScrollPos(int orient) const
 {
 int wxWindowMac::GetScrollPos(int orient) const
 {

+#if wxUSE_SCROLLBAR

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


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

-
+#endif

     return 0;
 }
 
     return 0;
 }
 


@@ -1270,6 +1220,7 @@ int wxWindowMac::GetScrollPos(int orient) const
 // of positions that we can scroll.
 int wxWindowMac::GetScrollRange(int orient) const
 {
 // of positions that we can scroll.
 int wxWindowMac::GetScrollRange(int orient) const
 {

+#if wxUSE_SCROLLBAR

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


@@ -1280,12 +1231,13 @@ int wxWindowMac::GetScrollRange(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetRange() ;
     }

-
+#endif

     return 0;
 }
 
 int wxWindowMac::GetScrollThumb(int orient) const
 {
     return 0;
 }
 
 int wxWindowMac::GetScrollThumb(int orient) const
 {

+#if wxUSE_SCROLLBAR

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


@@ -1296,12 +1248,13 @@ int wxWindowMac::GetScrollThumb(int orient) const
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }
        if ( m_vScrollBar )
            return m_vScrollBar->GetThumbSize() ;
     }

-
+#endif

     return 0;
 }
 
 void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {
     return 0;
 }
 
 void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
 {

+#if wxUSE_SCROLLBAR

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


@@ -1312,6 +1265,7 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
        if ( m_vScrollBar )
            m_vScrollBar->SetThumbPosition( pos ) ;
     }
        if ( m_vScrollBar )
            m_vScrollBar->SetThumbPosition( pos ) ;
     }

+#endif

 }
 
 void
 }
 
 void


@@ -1345,13 +1299,14 @@ void  wxWindowMac::MacPaintGrowBox()
     if ( IsTopLevel() )
         return ;
 
     if ( IsTopLevel() )
         return ;
 

+#if wxUSE_SCROLLBAR

     if ( MacHasScrollBarCorner() )
     {
         CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         int tx,ty,tw,th;
     if ( MacHasScrollBarCorner() )
     {
         CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
         wxASSERT( cgContext ) ;
 
         int tx,ty,tw,th;

-    
+

         m_peer->GetSize( tw, th );
         m_peer->GetPosition( tx, ty );
 
         m_peer->GetSize( tw, th );
         m_peer->GetPosition( tx, ty );
 


@@ -1360,7 +1315,6 @@ void  wxWindowMac::MacPaintGrowBox()
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
 
         int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
         CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;

-        CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;

         CGContextSaveGState( cgContext );
 
         if ( m_backgroundColour.Ok() )
         CGContextSaveGState( cgContext );
 
         if ( m_backgroundColour.Ok() )


@@ -1374,6 +1328,7 @@ void  wxWindowMac::MacPaintGrowBox()
         CGContextFillRect( cgContext, cgrect );
         CGContextRestoreGState( cgContext );
     }
         CGContextFillRect( cgContext, cgrect );
         CGContextRestoreGState( cgContext );
     }

+#endif

 }
 
 void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )
 }
 
 void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )


@@ -1385,7 +1340,7 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
 
     // back to the surrounding frame rectangle
     int tx,ty,tw,th;
 
     // back to the surrounding frame rectangle
     int tx,ty,tw,th;

-    
+

     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 
     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 


@@ -1399,66 +1354,53 @@ void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(right
         CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
             rect.bottom - rect.top ) ;
 
         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.isFocused = hasFocus ;
-

         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 ( m_peer->NeedsFrame() )

         {
         {

-            info.kind = kHIThemeFrameTextFieldSquare ;
-            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
-        }
-        else if ( HasFlag(wxSIMPLE_BORDER) )
-        {
-            info.kind = kHIThemeFrameListBox ;
-            HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            HIThemeFrameDrawInfo info ;
+            memset( &info, 0 , sizeof(info) ) ;
+
+            info.version = 0 ;
+            info.kind = 0 ;
+            info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+            info.isFocused = hasFocus ;
+
+            if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+            {
+                info.kind = kHIThemeFrameTextFieldSquare ;
+                HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            }
+            else if ( HasFlag(wxSIMPLE_BORDER) )
+            {
+                info.kind = kHIThemeFrameListBox ;
+                HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+            }

         }
         }

-        else if ( hasFocus )
+
+        if ( hasFocus )

         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }
         {
             HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
         }

-#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
-        m_peer->GetRect( &rect ) ;
-        if ( MacHasScrollBarCorner() )
-        {
-            int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
-            int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
-            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) ) ;
-            info.version = 0 ;
-            info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
-            info.kind = kHIThemeGrowBoxKindNone ;
-            // contrary to the docs ...SizeSmall does not work
-            info.size = kHIThemeGrowBoxSizeNormal ;
-            info.direction = 0 ;
-            HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
-        }
-#endif

     }
 #endif // wxOSX_USE_COCOA_OR_CARBON
 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )
 {
     }
 #endif // wxOSX_USE_COCOA_OR_CARBON
 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )
 {

+#if wxUSE_SCROLLBAR

     if ( child == m_hScrollBar )
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;
     if ( child == m_hScrollBar )
         m_hScrollBar = NULL ;
     if ( child == m_vScrollBar )
         m_vScrollBar = NULL ;

-
+#endif

     wxWindowBase::RemoveChild( child ) ;
 }
 
 void wxWindowMac::DoUpdateScrollbarVisibility()
 {
     wxWindowBase::RemoveChild( child ) ;
 }
 
 void wxWindowMac::DoUpdateScrollbarVisibility()
 {

+#if wxUSE_SCROLLBAR

     bool triggerSizeEvent = false;
 
     if ( m_hScrollBar )
     bool triggerSizeEvent = false;
 
     if ( m_hScrollBar )


@@ -1490,18 +1432,21 @@ void wxWindowMac::DoUpdateScrollbarVisibility()
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }
         event.SetEventObject(this);
         HandleWindowEvent(event);
     }

+#endif

 }
 
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
                                int range, bool refresh)
 {
 }
 
 // New function that will replace some of the above.
 void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
                                int range, bool refresh)
 {

+#if wxUSE_SCROLLBAR

     if ( orient == wxHORIZONTAL && m_hScrollBar )
         m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
     else if ( orient == wxVERTICAL && m_vScrollBar )
         m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
 
     DoUpdateScrollbarVisibility();
     if ( orient == wxHORIZONTAL && m_hScrollBar )
         m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
     else if ( orient == wxVERTICAL && m_vScrollBar )
         m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
 
     DoUpdateScrollbarVisibility();

+#endif

 }
 
 // Does a physical scroll
 }
 
 // Does a physical scroll


@@ -1530,10 +1475,12 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         child = node->GetData();
         if (child == NULL)
             continue;
         child = node->GetData();
         if (child == NULL)
             continue;

+#if wxUSE_SCROLLBAR

         if (child == m_vScrollBar)
             continue;
         if (child == m_hScrollBar)
             continue;
         if (child == m_vScrollBar)
             continue;
         if (child == m_hScrollBar)
             continue;

+#endif

         if (child->IsTopLevel())
             continue;
 
         if (child->IsTopLevel())
             continue;
 


@@ -1554,6 +1501,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
 
 void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 {
 
 void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 {

+#if wxUSE_SCROLLBAR

     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {
         wxScrollWinEvent wevent;
     if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
     {
         wxScrollWinEvent wevent;


@@ -1580,18 +1528,12 @@ void wxWindowMac::MacOnScroll( wxScrollEvent &event )
 
         HandleWindowEvent(wevent);
     }
 
         HandleWindowEvent(wevent);
     }

+#endif

 }
 
 }
 

-// Get the window with the focus

 wxWindow *wxWindowBase::DoFindFocus()
 {
 wxWindow *wxWindowBase::DoFindFocus()
 {

-#if wxOSX_USE_CARBON
-    ControlRef control ;
-    GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
-    return wxFindWindowFromWXWidget( (WXWidget) control ) ;
-#else
-    return NULL;
-#endif
+    return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());

 }
 
 void wxWindowMac::OnInternalIdle()
 }
 
 void wxWindowMac::OnInternalIdle()


@@ -1751,7 +1693,7 @@ void wxWindowMac::MacUpdateClippedRects() const
     Rect rIncludingOuterStructures ;
 
     int tx,ty,tw,th;
     Rect rIncludingOuterStructures ;
 
     int tx,ty,tw,th;

-    
+

     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 
     m_peer->GetSize( tw, th );
     m_peer->GetPosition( tx, ty );
 


@@ -1835,115 +1777,134 @@ void wxWindowMac::MacUpdateClippedRects() const
 /*
     This function must not change the updatergn !
  */
 /*
     This function must not change the updatergn !
  */

-bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
+bool wxWindowMac::MacDoRedraw( long time )

 {
     bool handled = false ;
 {
     bool handled = false ;

-#if wxOSX_USE_CARBON
-    Rect updatebounds ;
-    RgnHandle updatergn = (RgnHandle) updatergnr ;
-    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 ) ;
+    wxRegion formerUpdateRgn = m_updateRegion;
+    wxRegion clientUpdateRgn = formerUpdateRgn;
+
+    const wxRect clientRect = GetClientRect();
+
+    clientUpdateRgn.Intersect(clientRect);

 
 

-    if ( !EmptyRgn(updatergn) )
+    // first send an erase event to the entire update area
+    const wxBackgroundStyle bgStyle = GetBackgroundStyle();
+    switch ( bgStyle )

     {
     {

-        RgnHandle newupdate = NewRgn() ;
-        wxSize point = GetClientSize() ;
-        wxPoint origin = GetClientAreaOrigin() ;
-        SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
-        SectRgn( newupdate , updatergn , newupdate ) ;
+        case wxBG_STYLE_ERASE:
+        case wxBG_STYLE_SYSTEM:
+            {
+                // for the toplevel window this really is the entire area for
+                // all the others only their client area, otherwise they might
+                // be drawing with full alpha and eg put blue into the grow-box
+                // area of a scrolled window (scroll sample)
+                wxWindowDC dc(this);
+                if ( IsTopLevel() )
+                    dc.SetDeviceClippingRegion(formerUpdateRgn);
+                else
+                    dc.SetDeviceClippingRegion(clientUpdateRgn);

 
 

-        // first send an erase event to the entire update area
-        {
-            // for the toplevel window this really is the entire area
-            // for all the others only their client area, otherwise they
-            // might be drawing with full alpha and eg put blue into
-            // the grow-box area of a scrolled window (scroll sample)
-            wxDC* dc = new wxWindowDC(this);
-            if ( IsTopLevel() )
-                dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
-            else
-                dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
+                if ( bgStyle == wxBG_STYLE_ERASE )
+                {
+                    wxEraseEvent eevent( GetId(), &dc );
+                    eevent.SetEventObject( this );
+                    if ( ProcessWindowEvent( eevent ) )
+                        break;
+                }

 
 

-            wxEraseEvent eevent( GetId(), dc );
-            eevent.SetEventObject( this );
-            HandleWindowEvent( eevent );
-            delete dc ;
-        }
+                if ( UseBgCol() )
+                {
+                    dc.SetBackground(GetBackgroundColour());
+                    dc.Clear();
+                }
+            }
+            break;

 
 

-        MacPaintGrowBox();
+        case wxBG_STYLE_PAINT:
+            // nothing to do, user-defined EVT_PAINT handler will overwrite the
+            // entire window client area
+            break;

 
 

-        // calculate a client-origin version of the update rgn and set m_updateRegion to that
-        OffsetRgn( newupdate , -origin.x , -origin.y ) ;
-        m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
-        DisposeRgn( newupdate ) ;
+        default:
+            wxFAIL_MSG( "unsupported background style" );
+    }

 
 

-        if ( !m_updateRegion.Empty() )
-        {
-            // paint the window itself
+    MacPaintGrowBox();

 
 

-            wxPaintEvent event;
-            event.SetTimestamp(time);
-            event.SetEventObject(this);
-            HandleWindowEvent(event);
-            handled = true ;
-        }
+    // calculate a client-origin version of the update rgn and set
+    // m_updateRegion to that
+    clientUpdateRgn.Offset(-clientRect.GetPosition());
+    m_updateRegion = clientUpdateRgn ;

 
 

-        // now we cannot rely on having its borders drawn by a window itself, as it does not
-        // get the updateRgn wide enough to always do so, so we do it from the parent
-        // this would also be the place to draw any custom backgrounds for native controls
-        // in Composited windowing
-        wxPoint clientOrigin = GetClientAreaOrigin() ;
+    if ( !m_updateRegion.Empty() )
+    {
+        // paint the window itself
+
+        wxPaintEvent event(GetId());
+        event.SetTimestamp(time);
+        event.SetEventObject(this);
+        handled = HandleWindowEvent(event);
+    }
+
+    m_updateRegion = formerUpdateRgn;
+    return handled;
+}
+
+void wxWindowMac::MacPaintChildrenBorders()
+{
+    // now we cannot rely on having its borders drawn by a window itself, as it does not
+    // get the updateRgn wide enough to always do so, so we do it from the parent
+    // this would also be the place to draw any custom backgrounds for native controls
+    // in Composited windowing
+    wxPoint clientOrigin = GetClientAreaOrigin() ;

 
 

-        wxWindowMac *child;
-        int x, y, w, h;
-        for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+    wxWindowMac *child;
+    int x, y, w, h;
+    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+    {
+        child = node->GetData();
+        if (child == NULL)
+            continue;
+#if wxUSE_SCROLLBAR
+        if (child == m_vScrollBar)
+            continue;
+        if (child == m_hScrollBar)
+            continue;
+#endif
+        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
+
+        child->GetPosition( &x, &y );
+        child->GetSize( &w, &h );
+
+        if ( m_updateRegion.Contains(clientOrigin.x+x-10, clientOrigin.y+y-10, w+20, h+20) )

         {
         {

-            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
-
-            child->GetPosition( &x, &y );
-            child->GetSize( &w, &h );
-            Rect childRect = { y , x , y + h , x + w } ;
-            OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
-            InsetRect( &childRect , -10 , -10) ;
-
-            if ( RectInRgn( &childRect , updatergn ) )
+            // paint custom borders
+            wxNcPaintEvent eventNc( child->GetId() );
+            eventNc.SetEventObject( child );
+            if ( !child->HandleWindowEvent( eventNc ) )

             {
             {

-                // paint custom borders
-                wxNcPaintEvent eventNc( child->GetId() );
-                eventNc.SetEventObject( child );
-                if ( !child->HandleWindowEvent( eventNc ) )
-                {
-                    child->MacPaintBorders(0, 0) ;
-                }
+                child->MacPaintBorders(0, 0) ;

             }
         }
     }
             }
         }
     }

-#endif
-    return handled ;

 }
 
 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {
 }
 
 
 WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
 {

-    wxNonOwnedWindow* tlw = MacGetTopLevelWindow(); 
+    wxNonOwnedWindow* tlw = MacGetTopLevelWindow();

     return tlw ? tlw->GetWXWindow() : NULL ;
 }
 
 bool wxWindowMac::MacHasScrollBarCorner() const
 {
     return tlw ? tlw->GetWXWindow() : NULL ;
 }
 
 bool wxWindowMac::MacHasScrollBarCorner() const
 {

+#if wxUSE_SCROLLBAR

     /* Returns whether the scroll bars in a wxScrolledWindow should be
      * shortened. Scroll bars should be shortened if either:
      *
     /* Returns whether the scroll bars in a wxScrolledWindow should be
      * shortened. Scroll bars should be shortened if either:
      *


@@ -2004,10 +1965,14 @@ bool wxWindowMac::MacHasScrollBarCorner() const
         // No parent frame found
         return false ;
     }
         // No parent frame found
         return false ;
     }

+#else
+    return false;
+#endif

 }
 
 void wxWindowMac::MacCreateScrollBars( long style )
 {
 }
 
 void wxWindowMac::MacCreateScrollBars( long style )
 {

+#if wxUSE_SCROLLBAR

     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )


@@ -2044,17 +2009,23 @@ void wxWindowMac::MacCreateScrollBars( long style )
     // because the create does not take into account the client area origin
     // we might have a real position shift
     MacRepositionScrollBars() ;
     // because the create does not take into account the client area origin
     // we might have a real position shift
     MacRepositionScrollBars() ;

+#endif

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

-    bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+    bool result = ((child == NULL)
+#if wxUSE_SCROLLBAR
+     || ((child != m_hScrollBar) && (child != m_vScrollBar))
+#endif
+     );

 
     return result ;
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {
 
     return result ;
 }
 
 void wxWindowMac::MacRepositionScrollBars()
 {

+#if wxUSE_SCROLLBAR

     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 
     if ( !m_hScrollBar && !m_vScrollBar )
         return ;
 


@@ -2077,11 +2048,15 @@ void wxWindowMac::MacRepositionScrollBars()
         m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
     if ( m_hScrollBar )
         m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );
         m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
     if ( m_hScrollBar )
         m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );

+#endif

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

-    return m_peer->CanFocus() && wxWindowBase::AcceptsFocus();
+    if ( MacIsUserPane() )
+        return wxWindowBase::AcceptsFocus();
+    else
+        return m_peer->CanFocus();

 }
 
 void wxWindowMac::MacSuperChangedPosition()
 }
 
 void wxWindowMac::MacSuperChangedPosition()


@@ -2123,25 +2098,28 @@ long wxWindowMac::MacGetLeftBorderSize() const
 
     SInt32 border = 0 ;
 
 
     SInt32 border = 0 ;
 

-    if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+    if ( m_peer && m_peer->NeedsFrame() )

     {
     {

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

 #if wxOSX_USE_COCOA_OR_CARBON
 #if wxOSX_USE_COCOA_OR_CARBON

-        // this metric is only the 'outset' outside the simple frame rect
-        GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
-        border += 1;
+            // this metric is only the 'outset' outside the simple frame rect
+            GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+            border += 1;

 #else
 #else

-        border += 2;
+            border += 2;

 #endif
 #endif

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

 #if wxOSX_USE_COCOA_OR_CARBON
 #if wxOSX_USE_COCOA_OR_CARBON

-        // this metric is only the 'outset' outside the simple frame rect
-        GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-        border += 1;
+            // this metric is only the 'outset' outside the simple frame rect
+            GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+            border += 1;

 #else
 #else

-        border += 1;
+            border += 1;

 #endif
 #endif

+        }

     }
 
     return border ;
     }
 
     return border ;


@@ -2216,24 +2194,7 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-#if wxOSX_USE_COCOA_OR_CARBON
-    // for native controls: call their native paint method
-    if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
-    {
-        if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
-             && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
-            CallNextEventHandler(
-                (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
-                (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
-    }
-#endif
-}
-
-void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control),
-                                        wxInt16 WXUNUSED(controlpart),
-                                        bool WXUNUSED(mouseStillDown))
+void wxWindowMac::TriggerScrollEvent( wxEventType WXUNUSED(scrollEvent) )

 {
 }
 
 {
 }
 


@@ -2247,7 +2208,7 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     return bounds ;
 }
 
     return bounds ;
 }
 

-bool wxWindowMac::HandleClicked( double timestampsec )
+bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     return false;
 }
 {
     return false;
 }


@@ -2255,9 +2216,9 @@ bool wxWindowMac::HandleClicked( double timestampsec )
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON

-    if ( HandleClicked( GetEventTime((EventRef)event) ) )
+    if ( OSXHandleClicked( GetEventTime((EventRef)event) ) )

         return noErr;
         return noErr;

-        
+

     return eventNotHandledErr ;
 #else
     return 0;
     return eventNotHandledErr ;
 #else
     return 0;


@@ -2321,8 +2282,49 @@ bool wxWindowMac::IsShownOnScreen() const
     return wxWindowBase::IsShownOnScreen();
 }
 
     return wxWindowBase::IsShownOnScreen();
 }
 

+bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
+{
+    bool handled = HandleWindowEvent( event ) ;
+    if ( handled && event.GetSkipped() )
+        handled = false ;
+
+#if wxUSE_ACCEL
+    if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
+    {
+        wxWindow *ancestor = this;
+        while (ancestor)
+        {
+            int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+            if (command != -1)
+            {
+                wxEvtHandler * const handler = ancestor->GetEventHandler();
+
+                wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+                handled = handler->ProcessEvent( command_event );
+
+                if ( !handled )
+                {
+                    // accelerators can also be used with buttons, try them too
+                    command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+                    handled = handler->ProcessEvent( command_event );
+                }
+
+                break;
+            }
+
+            if (ancestor->IsTopLevel())
+                break;
+
+            ancestor = ancestor->GetParent();
+        }
+    }
+#endif // wxUSE_ACCEL
+
+    return handled ;
+}
+

 //
 //

-// wxWidgetImpl 
+// wxWidgetImpl

 //
 
 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
 //
 
 WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);


@@ -2334,7 +2336,7 @@ wxWindowMac *wxFindWindowFromWXWidget(WXWidget inControl )
     wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
     if ( impl )
         return impl->GetWXPeer();
     wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
     if ( impl )
         return impl->GetWXPeer();

-    
+

     return NULL;
 }
 
     return NULL;
 }
 


@@ -2400,6 +2402,7 @@ void wxWidgetImpl::Init()
     m_isRootControl = false;
     m_wxPeer = NULL;
     m_needsFocusRect = false;
     m_isRootControl = false;
     m_wxPeer = NULL;
     m_needsFocusRect = false;

+    m_needsFrame = true;

 }
 
 void wxWidgetImpl::SetNeedsFocusRect( bool needs )
 }
 
 void wxWidgetImpl::SetNeedsFocusRect( bool needs )


@@ -2412,3 +2415,12 @@ bool wxWidgetImpl::NeedsFocusRect() const
     return m_needsFocusRect;
 }
 
     return m_needsFocusRect;
 }
 

+void wxWidgetImpl::SetNeedsFrame( bool needs )
+{
+    m_needsFrame = needs;
+}
+
+bool wxWidgetImpl::NeedsFrame() const
+{
+    return m_needsFrame;
+}