splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index b8a268cd53b1b07e06602330c2374f1ffac5a7f9..11a7167c4a43b26fc679d5251abe2dbe34bda7f3 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -41,10 +41,22 @@
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 

+#if wxUSE_LISTCTRL
+    #include "wx/listctrl.h"
+#endif
+
+#if wxUSE_TREECTRL
+    #include "wx/treectrl.h"
+#endif
+

 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif
 
 #if wxUSE_CARET
     #include "wx/caret.h"
 #endif
 

+#if wxUSE_POPUPWIN
+    #include "wx/popupwin.h"
+#endif
+

 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 #endif
 #if wxUSE_DRAG_AND_DROP
 #include "wx/dnd.h"
 #endif


@@ -54,19 +66,6 @@
 #define MAC_SCROLLBAR_SIZE 15
 #define MAC_SMALL_SCROLLBAR_SIZE 11
 
 #define MAC_SCROLLBAR_SIZE 15
 #define MAC_SMALL_SCROLLBAR_SIZE 11
 

-#ifndef __DARWIN__
-#include <Windows.h>
-#include <ToolUtils.h>
-#include <Scrap.h>
-#include <MacTextEditor.h>
-#endif
-
-#if TARGET_API_MAC_OSX
-#ifndef __HIVIEW__
-    #include <HIToolbox/HIView.h>
-#endif
-#endif
-

 #include <string.h>
 
 #ifdef __WXUNIVERSAL__
 #include <string.h>
 
 #ifdef __WXUNIVERSAL__


@@ -78,11 +77,7 @@
 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)

-#if TARGET_API_MAC_OSX

     EVT_PAINT(wxWindowMac::OnPaint)
     EVT_PAINT(wxWindowMac::OnPaint)

-#endif
-    EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
-    EVT_KILL_FOCUS(wxWindowMac::OnSetFocus)

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


@@ -142,17 +137,6 @@ void wxMacWindowToNative( const wxWindow* window , Rect *rect )
 // Carbon Events
 // ---------------------------------------------------------------------------
 
 // Carbon Events
 // ---------------------------------------------------------------------------
 

-#if TARGET_API_MAC_OSX
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3
-enum
-{
-    kEventControlVisibilityChanged = 157
-};
-#endif
-
-#endif
-

 static const EventTypeSpec eventList[] =
 {
     { kEventClassCommand, kEventProcessCommand } ,
 static const EventTypeSpec eventList[] =
 {
     { kEventClassCommand, kEventProcessCommand } ,


@@ -165,15 +149,16 @@ static const EventTypeSpec eventList[] =
     { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
 
     { kEventClassControl , kEventControlDraw } ,
     { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
 
     { kEventClassControl , kEventControlDraw } ,

-#if TARGET_API_MAC_OSX
+

     { kEventClassControl , kEventControlVisibilityChanged } ,
     { kEventClassControl , kEventControlEnabledStateChanged } ,
     { kEventClassControl , kEventControlHiliteChanged } ,
 
     { kEventClassControl , kEventControlActivate } ,
     { kEventClassControl , kEventControlDeactivate } ,
     { kEventClassControl , kEventControlVisibilityChanged } ,
     { kEventClassControl , kEventControlEnabledStateChanged } ,
     { kEventClassControl , kEventControlHiliteChanged } ,
 
     { kEventClassControl , kEventControlActivate } ,
     { kEventClassControl , kEventControlDeactivate } ,

-#endif
+

     { kEventClassControl , kEventControlSetFocusPart } ,
     { kEventClassControl , kEventControlSetFocusPart } ,

+    { kEventClassControl , kEventControlFocusPartChanged } ,

 
     { kEventClassService , kEventServiceGetTypes },
     { kEventClassService , kEventServiceCopy },
 
     { kEventClassService , kEventServiceGetTypes },
     { kEventClassService , kEventServiceCopy },


@@ -196,7 +181,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
     switch ( GetEventKind( event ) )
     {
 
     switch ( GetEventKind( event ) )
     {

-#if TARGET_API_MAC_OSX

         case kEventControlDraw :
             {
                 RgnHandle updateRgn = NULL ;
         case kEventControlDraw :
             {
                 RgnHandle updateRgn = NULL ;


@@ -205,7 +189,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {
 
                 if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
                 {

-                    updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+                    HIShapeGetAsQDRgn( visRegion.GetWXHRGN(), updateRgn );

                 }
                 else
                 {
                 }
                 else
                 {


@@ -221,9 +205,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                     }
                 }
 
                     }
                 }
 

-                Rect rgnBounds ;
-                GetRegionBounds( updateRgn , &rgnBounds ) ;
-

 #if wxMAC_DEBUG_REDRAW
                 if ( thisWindow->MacIsUserPane() )
                 {
 #if wxMAC_DEBUG_REDRAW
                 if ( thisWindow->MacIsUserPane() )
                 {


@@ -248,7 +229,6 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 #endif
 
                 {
 #endif
 
                 {

-#if wxMAC_USE_CORE_GRAPHICS

                     bool created = false ;
                     CGContextRef cgContext = NULL ;
                     OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;
                     bool created = false ;
                     CGContextRef cgContext = NULL ;
                     OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;


@@ -257,12 +237,12 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
                     {
                         wxMacCGContextStateSaver sg( cgContext ) ;
 
                     {
                         wxMacCGContextStateSaver sg( cgContext ) ;

-                        float alpha = 1.0 ;
+                        CGFloat alpha = (CGFloat)1.0 ;

                         {
                             wxWindow* iter = thisWindow ;
                         {
                             wxWindow* iter = thisWindow ;

-                            while ( iter ) 
+                            while ( iter )

                             {
                             {

-                                alpha *= (float) iter->GetTransparent()/255.0 ;
+                                alpha *= (CGFloat)( iter->GetTransparent()/255.0 ) ;

                                 if ( iter->IsTopLevel() )
                                     iter = NULL ;
                                 else
                                 if ( iter->IsTopLevel() )
                                     iter = NULL ;
                                 else


@@ -270,17 +250,24 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                             }
                         }
                         CGContextSetAlpha( cgContext , alpha ) ;
                             }
                         }
                         CGContextSetAlpha( cgContext , alpha ) ;

-#endif
+
+                        if ( thisWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+                        {
+                            HIRect bounds;
+                            HIViewGetBounds( controlRef, &bounds );
+                            CGContextClearRect( cgContext, bounds );
+                        }
+
+
+

                         if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
                             result = noErr ;
 
                         if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
                             result = noErr ;
 

-#if wxMAC_USE_CORE_GRAPHICS

                         thisWindow->MacSetCGContextRef( NULL ) ;
                     }
 
                     if ( created )
                         CGContextRelease( cgContext ) ;
                         thisWindow->MacSetCGContextRef( NULL ) ;
                     }
 
                     if ( created )
                         CGContextRelease( cgContext ) ;

-#endif

                 }
 
                 if ( allocatedRgn )
                 }
 
                 if ( allocatedRgn )


@@ -289,47 +276,63 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
             break ;
 
         case kEventControlVisibilityChanged :
             break ;
 
         case kEventControlVisibilityChanged :

-            thisWindow->MacVisibilityChanged() ;
+            // we might have two native controls attributed to the same wxWindow instance
+            // eg a scrollview and an embedded textview, make sure we only fire for the 'outer'
+            // control, as otherwise native and wx visibility are different
+            if ( thisWindow->GetPeer() != NULL && thisWindow->GetPeer()->GetControlRef() == controlRef )
+            {
+                thisWindow->MacVisibilityChanged() ;
+            }

             break ;
 
         case kEventControlEnabledStateChanged :
             break ;
 
         case kEventControlEnabledStateChanged :

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

             break ;
 
         case kEventControlHiliteChanged :
             thisWindow->MacHiliteChanged() ;
             break ;
             break ;
 
         case kEventControlHiliteChanged :
             thisWindow->MacHiliteChanged() ;
             break ;

-            
+

         case kEventControlActivate :
         case kEventControlDeactivate :
         case kEventControlActivate :
         case kEventControlDeactivate :

-            if ( thisWindow->IsKindOf( CLASSINFO( wxTreeCtrl ) ) 
-                    || thisWindow->IsKindOf( CLASSINFO( wxListCtrl ) ) 
-                )
+            // FIXME: we should have a virtual function for this!
+#if wxUSE_TREECTRL
+            if ( thisWindow->IsKindOf( CLASSINFO( wxTreeCtrl ) ) )
+                thisWindow->Refresh();
+#endif
+#if wxUSE_LISTCTRL
+            if ( thisWindow->IsKindOf( CLASSINFO( wxListCtrl ) ) )

                 thisWindow->Refresh();
                 thisWindow->Refresh();

-            
-            //thisWindow->MacActivateStateChanged() ;
-            break ;

 #endif
 #endif

+            break ;

 
 

-        // we emulate this event under Carbon CFM
-        case kEventControlSetFocusPart :
+        //
+        // focus handling
+        // different handling on OS X
+        //
+
+        case kEventControlFocusPartChanged :
+            // the event is emulated by wxmac for systems lower than 10.5

             {
             {

-                Boolean focusEverything = false ;
-                ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+                ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
+                ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );

 
 

-#ifdef __WXMAC_OSX__
-                if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+                if ( thisWindow->MacGetTopLevelWindow() && thisWindow->GetPeer()->NeedsFocusRect() )

                 {
                 {

+                    thisWindow->MacInvalidateBorders();

                 }
                 }

-#endif

 
 

-                if ( controlPart == kControlFocusNoPart )
+                if ( currentControlPart == 0 )

                 {
                 {

+                    // kill focus

 #if wxUSE_CARET
                     if ( thisWindow->GetCaret() )
                         thisWindow->GetCaret()->OnKillFocus();
 #endif
 
 #if wxUSE_CARET
                     if ( thisWindow->GetCaret() )
                         thisWindow->GetCaret()->OnKillFocus();
 #endif
 

+                    wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+
+                    // remove this as soon as posting the synthesized event works properly

                     static bool inKillFocusEvent = false ;
 
                     if ( !inKillFocusEvent )
                     static bool inKillFocusEvent = false ;
 
                     if ( !inKillFocusEvent )


@@ -337,15 +340,17 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                         inKillFocusEvent = true ;
                         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
                         event.SetEventObject(thisWindow);
                         inKillFocusEvent = true ;
                         wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
                         event.SetEventObject(thisWindow);

-                        thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                        thisWindow->HandleWindowEvent(event) ;

                         inKillFocusEvent = false ;
                     }
                 }
                         inKillFocusEvent = false ;
                     }
                 }

-                else
+                else if ( previousControlPart == 0 )

                 {
                 {

+                    // set focus

                     // panel wants to track the window which was the last to have focus in it
                     // panel wants to track the window which was the last to have focus in it

-                    wxChildFocusEvent eventFocus(thisWindow);
-                    thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
+                    wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+                    wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+                    thisWindow->HandleWindowEvent(eventFocus);

 
 #if wxUSE_CARET
                     if ( thisWindow->GetCaret() )
 
 #if wxUSE_CARET
                     if ( thisWindow->GetCaret() )


@@ -354,11 +359,98 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);
 
                     wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
                     event.SetEventObject(thisWindow);

-                    thisWindow->GetEventHandler()->ProcessEvent(event) ;
+                    thisWindow->HandleWindowEvent(event) ;
+                }
+            }
+            break;
+        case kEventControlSetFocusPart :
+            {
+#ifdef __WXMAC_OSX__
+                Boolean focusEverything = false ;
+                if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+                {
+                    // put a breakpoint here to catch focus everything events

                 }
                 }

+#endif
+                ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+
+                ControlPartCode previousControlPart = 0;
+                verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));

 
                 if ( thisWindow->MacIsUserPane() )
 
                 if ( thisWindow->MacIsUserPane() )

+                {
+                    if ( controlPart != kControlFocusNoPart )
+                        cEvent.SetParameter<ControlPartCode>( kEventParamControlPart, typeControlPartCode, 1 ) ;

                     result = noErr ;
                     result = noErr ;

+                }
+                else
+                    result = CallNextEventHandler(handler, event);
+
+                if ( UMAGetSystemVersion() < 0x1050 )
+                {
+// set back to 0 if problems arise
+#if 1
+                    ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+                    // synthesize the event focus changed event
+                    EventRef evRef = NULL ;
+
+                    OSStatus err = MacCreateEvent(
+                                         NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
+                                         kEventAttributeUserEvent , &evRef );
+                    verify_noerr( err );
+
+                    wxMacCarbonEvent iEvent( evRef ) ;
+                    iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef ) ;
+                    iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart ) ;
+                    iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart ) ;
+
+#if 0
+                    // TODO test this first, avoid double posts etc...
+                    PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
+#else
+                    wxMacWindowControlEventHandler( NULL , evRef , data ) ;
+#endif
+                    ReleaseEvent( evRef ) ;
+#else
+                    // old implementation, to be removed if the new one works
+                    if ( controlPart == kControlFocusNoPart )
+                    {
+#if wxUSE_CARET
+                        if ( thisWindow->GetCaret() )
+                            thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+                        wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+
+                        static bool inKillFocusEvent = false ;
+
+                        if ( !inKillFocusEvent )
+                        {
+                            inKillFocusEvent = true ;
+                            wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+                            event.SetEventObject(thisWindow);
+                            thisWindow->HandleWindowEvent(event) ;
+                            inKillFocusEvent = false ;
+                        }
+                    }
+                    else
+                    {
+                        // panel wants to track the window which was the last to have focus in it
+                        wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+                        wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+                        thisWindow->HandleWindowEvent(eventFocus);
+
+    #if wxUSE_CARET
+                        if ( thisWindow->GetCaret() )
+                            thisWindow->GetCaret()->OnSetFocus();
+    #endif
+
+                        wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+                        event.SetEventObject(thisWindow);
+                        thisWindow->HandleWindowEvent(event) ;
+                    }
+#endif
+                }

             }
             break ;
 
             }
             break ;
 


@@ -368,7 +460,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 
         case kEventControlGetClickActivation :
             {
 
         case kEventControlGetClickActivation :
             {

-               // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise)
+                // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise)

                 WindowRef owner = cEvent.GetParameter<WindowRef>(kEventParamWindowRef);
                 if ( !IsWindowActive(owner) )
                 {
                 WindowRef owner = cEvent.GetParameter<WindowRef>(kEventParamWindowRef);
                 if ( !IsWindowActive(owner) )
                 {


@@ -385,7 +477,10 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus
+wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(handler),
+                               EventRef event,
+                               void *data)

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -437,9 +532,13 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
                 textCtrl->GetSelection( &from , &to ) ;
                 wxString val = textCtrl->GetValue() ;
                 val = val.Mid( from , to - from ) ;
                 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() ) ) ;
+                PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
+                verify_noerr( PasteboardClear( pasteboard ) ) ;
+                PasteboardSynchronize( pasteboard );
+                // TODO add proper conversion
+                CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*)val.c_str(), val.length() );
+                PasteboardPutItemFlavor( pasteboard, (PasteboardItemID) 1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0);
+                CFRelease( data );

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


@@ -447,22 +546,34 @@ static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handl
         case kEventServicePaste :
             if ( textCtrl )
             {
         case kEventServicePaste :
             if ( textCtrl )
             {

-                ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
-                Size textSize, pastedSize ;
-                verify_noerr( GetScrapFlavorSize(scrapRef, kTXNTextData, &textSize) ) ;
-                textSize++ ;
-                char *content = new char[textSize] ;
-                GetScrapFlavorData(scrapRef, kTXNTextData, &pastedSize, content );
-                content[textSize - 1] = 0 ;
-
+                PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
+                PasteboardSynchronize( pasteboard );
+                ItemCount itemCount;
+                verify_noerr( PasteboardGetItemCount( pasteboard, &itemCount ) );
+                for( UInt32 itemIndex = 1; itemIndex <= itemCount; itemIndex++ )
+                {
+                    PasteboardItemID itemID;
+                    if ( PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID ) == noErr )
+                    {
+                        CFDataRef flavorData = NULL;
+                        if ( PasteboardCopyItemFlavorData( pasteboard, itemID, CFSTR("com.apple.traditional-mac-plain-text"), &flavorData ) == noErr )
+                        {
+                            CFIndex flavorDataSize = CFDataGetLength( flavorData );
+                            char *content = new char[flavorDataSize+1] ;
+                            memcpy( content, CFDataGetBytePtr( flavorData ), flavorDataSize );
+                            content[flavorDataSize]=0;
+                            CFRelease( flavorData );

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

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

 #else
 #else

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

 #endif
 
 #endif
 

-                delete[] content ;
-                result = noErr ;
+                            delete[] content ;
+                            result = noErr ;
+                        }
+                    }
+                }

             }
             break ;
 
             }
             break ;
 


@@ -500,7 +611,7 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
         charBuf[ numChars - 1 ] = 0;
 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;
         charBuf[ numChars - 1 ] = 0;
 #if SIZEOF_WCHAR_T == 2
         uniChars = (wchar_t*) charBuf ;

-        memcpy( uniChars , charBuf , numChars * 2 ) ;
+/*        memcpy( uniChars , charBuf , numChars * 2 ) ;*/   // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)

 #else
         // the resulting string will never have more chars than the utf16 version, so this is safe
         wxMBConvUTF16 converter ;
 #else
         // the resulting string will never have more chars than the utf16 version, so this is safe
         wxMBConvUTF16 converter ;


@@ -520,7 +631,32 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
                     WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 
                     WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
                     wxTheApp->MacSetCurrentEvent( event , handler ) ;
 

+                    UInt32 message = uniChars[pos] < 128 ? (char)uniChars[pos] : '?';
+/*
+    NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent
+    multiple times to update the active range during inline input, so this handler will often receive
+    uncommited text, which should usually not trigger side effects. It might be a good idea to check the
+    kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h).
+    On the other hand, it can be useful for some applications to react to uncommitted text (for example,
+    to update a status display), as long as it does not disrupt the inline input session. Ideally, wx
+    should add new event types to support advanced text input. For now, I would keep things as they are.
+
+    However, the code that was being used caused additional problems:

                     UInt32 message = (0  << 8) + ((char)uniChars[pos] );
                     UInt32 message = (0  << 8) + ((char)uniChars[pos] );

+    Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline
+    input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji
+    for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB
+    (still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D
+    (the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress.
+    Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only
+    overlap with Unicode within the (7-bit) ASCII range.
+    But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks
+    for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII
+    characters as they are and replaces the rest with '?', ensuring that update events are triggered.
+    It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but
+    I don't have time to look into that right now.
+        -- CL
+*/

                     if ( wxTheApp->MacSendCharEvent(
                                                     focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
                     {
                     if ( wxTheApp->MacSendCharEvent(
                                                     focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
                     {


@@ -575,7 +711,10 @@ pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , Even
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus
+wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler),
+                               EventRef event,
+                               void *data)

 {
     OSStatus result = eventNotHandledErr ;
     wxWindowMac* focus = (wxWindowMac*) data ;
 {
     OSStatus result = eventNotHandledErr ;
     wxWindowMac* focus = (wxWindowMac*) data ;


@@ -596,74 +735,11 @@ static pascal OSStatus wxMacWindowCommandEventHandler( EventHandlerCallRef handl
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :
         switch ( cEvent.GetKind() )
         {
             case kEventProcessCommand :

-                {
-                    if (item->IsCheckable())
-                        item->Check( !item->IsChecked() ) ;
-
-                    if ( itemMenu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) )
-                        result = noErr ;
-                    else
-                    {
-                        wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED , id);
-                        event.SetEventObject(focus);
-                        event.SetInt(item->IsCheckable() ? item->IsChecked() : -1);
-
-                        if ( focus->GetEventHandler()->ProcessEvent(event) )
-                            result = noErr ;
-                    }
-                }
+                result = itemMenu->MacHandleCommandProcess( item, id, focus );

             break ;
 
             case kEventCommandUpdateStatus:
             break ;
 
             case kEventCommandUpdateStatus:

-                {
-                    wxUpdateUIEvent event(id);
-                    event.SetEventObject( itemMenu );
-
-                    bool processed = false;
-
-                    // Try the menu's event handler
-                    {
-                        wxEvtHandler *handler = itemMenu->GetEventHandler();
-                        if ( handler )
-                            processed = handler->ProcessEvent(event);
-                    }
-
-                    // Try the window the menu was popped up from
-                    // (and up through the hierarchy)
-                    if ( !processed )
-                    {
-                        const wxMenuBase *menu = itemMenu;
-                        while ( menu )
-                        {
-                            wxWindow *win = menu->GetInvokingWindow();
-                            if ( win )
-                            {
-                                processed = win->GetEventHandler()->ProcessEvent(event);
-                                break;
-                            }
-
-                            menu = menu->GetParent();
-                        }
-                    }
-
-                    if ( !processed )
-                    {
-                        processed = focus->GetEventHandler()->ProcessEvent(event);
-                    }
-
-                    if ( processed )
-                    {
-                        // if anything changed, update the changed attribute
-                        if (event.GetSetText())
-                            itemMenu->SetLabel(id, event.GetText());
-                        if (event.GetSetChecked())
-                            itemMenu->Check(id, event.GetChecked());
-                        if (event.GetSetEnabled())
-                            itemMenu->Enable(id, event.GetEnabled());
-
-                        result = noErr ;
-                    }
-                }
+                result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus );

                 break ;
 
             default :
                 break ;
 
             default :


@@ -709,134 +785,6 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
 

-#if !TARGET_API_MAC_OSX
-
-// ---------------------------------------------------------------------------
-// UserPane events for non OSX builds
-// ---------------------------------------------------------------------------
-
-static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        win->MacControlUserPaneDrawProc(part) ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ;
-
-static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
-    else
-        return kControlNoPart ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ;
-
-static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
-    else
-        return kControlNoPart ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ;
-
-static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        win->MacControlUserPaneIdleProc() ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ;
-
-static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
-    else
-        return kControlNoPart ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ;
-
-static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        win->MacControlUserPaneActivateProc(activating) ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ;
-
-static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        return win->MacControlUserPaneFocusProc(action) ;
-    else
-        return kControlNoPart ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ;
-
-static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
-{
-    wxWindow * win = wxFindControlFromMacControl(control) ;
-    if ( win )
-        win->MacControlUserPaneBackgroundProc(info) ;
-}
-wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ;
-
-void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
-{
-    int x = 0 , y = 0;
-    RgnHandle rgn = NewRgn() ;
-    GetClip( rgn ) ;
-    MacWindowToRootWindow( &x, &y ) ;
-    OffsetRgn( rgn , -x , -y ) ;
-    wxMacWindowStateSaver sv( this ) ;
-    SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;
-    MacDoRedraw( rgn , 0 ) ;
-    DisposeRgn( rgn ) ;
-}
-
-wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
-{
-    return kControlNoPart ;
-}
-
-wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc)
-{
-    return kControlNoPart ;
-}
-
-void wxWindowMac::MacControlUserPaneIdleProc()
-{
-}
-
-wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
-{
-    return kControlNoPart ;
-}
-
-void wxWindowMac::MacControlUserPaneActivateProc(bool activating)
-{
-}
-
-wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
-{
-    if ( AcceptsFocus() )
-        return 1 ;
-    else
-        return kControlNoPart ;
-}
-
-void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)
-{
-}
-
-#endif
-

 // ---------------------------------------------------------------------------
 // Scrollbar Tracking for all
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Scrollbar Tracking for all
 // ---------------------------------------------------------------------------


@@ -923,30 +871,20 @@ wxWindowMac::wxWindowMac(wxWindowMac *parent,
 void wxWindowMac::Init()
 {
     m_peer = NULL ;
 void wxWindowMac::Init()
 {
     m_peer = NULL ;

-    m_frozenness = 0 ;

     m_macAlpha = 255 ;
     m_macAlpha = 255 ;

-
-#if WXWIN_COMPATIBILITY_2_4
-    m_backgroundTransparent = false;
-#endif
-
-#if wxMAC_USE_CORE_GRAPHICS

     m_cgContextRef = NULL ;
     m_cgContextRef = NULL ;

-#endif

 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = true;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = true;
 
     m_hScrollBar = NULL ;
     m_vScrollBar = NULL ;

-    m_macBackgroundBrush = wxNullBrush ;
+    m_hScrollBarAlwaysShown = false;
+    m_vScrollBarAlwaysShown = false;

 
     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;
 
     m_macIsUserPane = true;
     m_clipChildren = false ;
     m_cachedClippedRectValid = false ;

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

 }
 
 wxWindowMac::~wxWindowMac()
 }
 
 wxWindowMac::~wxWindowMac()


@@ -997,12 +935,14 @@ wxWindowMac::~wxWindowMac()
     if ( g_MacLastWindow == this )
         g_MacLastWindow = NULL ;
 
     if ( g_MacLastWindow == this )
         g_MacLastWindow = NULL ;
 

-    wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
+#ifndef __WXUNIVERSAL__
+    wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ;

     if ( frame )
     {
         if ( frame->GetLastFocus() == this )
             frame->SetLastFocus( NULL ) ;
     }
     if ( frame )
     {
         if ( frame->GetLastFocus() == this )
             frame->SetLastFocus( NULL ) ;
     }

+#endif

 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP
 
     // delete our drop target if we've got one
 #if wxUSE_DRAG_AND_DROP


@@ -1027,20 +967,6 @@ 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() )
-    {
-        m_peer->SetData<ControlUserPaneDrawUPP>(kControlEntireControl, kControlUserPaneDrawProcTag, GetwxMacControlUserPaneDrawProc()) ;
-        m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl, kControlUserPaneHitTestProcTag, GetwxMacControlUserPaneHitTestProc()) ;
-        m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl, kControlUserPaneTrackingProcTag, GetwxMacControlUserPaneTrackingProc()) ;
-        m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl, kControlUserPaneIdleProcTag, GetwxMacControlUserPaneIdleProc()) ;
-        m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl, kControlUserPaneKeyDownProcTag, GetwxMacControlUserPaneKeyDownProc()) ;
-        m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl, kControlUserPaneActivateProcTag, GetwxMacControlUserPaneActivateProc()) ;
-        m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl, kControlUserPaneFocusProcTag, GetwxMacControlUserPaneFocusProc()) ;
-        m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl, kControlUserPaneBackgroundProcTag, GetwxMacControlUserPaneBackgroundProc()) ;
-    }
-#endif

 }
 
 // Constructor
 }
 
 // Constructor


@@ -1103,7 +1029,7 @@ void wxWindowMac::MacChildAdded()
         m_hScrollBar->Raise() ;
 }
 
         m_hScrollBar->Raise() ;
 }
 

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

 {
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 
 {
     wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
 


@@ -1159,17 +1085,9 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
             break ;
 
         case wxWINDOW_VARIANT_MINI :
             break ;
 
         case wxWINDOW_VARIANT_MINI :

-           if (UMAGetSystemVersion() >= 0x1030 )
-            {
-                // not always defined in the headers
-                size = 3 ;
-                themeFont = 109 ;
-            }
-            else
-            {
-                size = kControlSizeSmall;
-                themeFont = kThemeSmallSystemFont ;
-            }
+            // not always defined in the headers
+            size = 3 ;
+            themeFont = 109 ;

             break ;
 
         case wxWINDOW_VARIANT_LARGE :
             break ;
 
         case wxWINDOW_VARIANT_LARGE :


@@ -1185,14 +1103,16 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
 
     wxFont font ;
     m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
 
     wxFont font ;

-    font.MacCreateThemeFont( themeFont ) ;
+    font.MacCreateFromThemeFont( themeFont ) ;

     SetFont( font ) ;
 }
 
 void wxWindowMac::MacUpdateControlFont()
 {
     m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
     SetFont( font ) ;
 }
 
 void wxWindowMac::MacUpdateControlFont()
 {
     m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;

-    Refresh() ;
+    // do not trigger refreshes upon invisible and possible partly created objects
+    if ( IsShownOnScreen() )
+        Refresh() ;

 }
 
 bool wxWindowMac::SetFont(const wxFont& font)
 }
 
 bool wxWindowMac::SetFont(const wxFont& font)


@@ -1219,28 +1139,11 @@ bool wxWindowMac::SetBackgroundColour(const wxColour& col )
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 
     if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
         return false ;
 

-    wxBrush brush ;
-    wxColour newCol(GetBackgroundColour());
-
-    if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )
-        brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
-    else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
-        brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
-    else
-        brush.SetColour( newCol ) ;
-
-    MacSetBackgroundBrush( brush ) ;
-    MacUpdateControlFont() ;
+    m_peer->SetBackgroundColour( col ) ;

 
     return true ;
 }
 
 
     return true ;
 }
 

-void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
-{
-    m_macBackgroundBrush = brush ;
-    m_peer->SetBackground( brush ) ;
-}
-

 bool wxWindowMac::MacCanFocus() const
 {
     // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so
 bool wxWindowMac::MacCanFocus() const
 {
     // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so


@@ -1279,43 +1182,6 @@ void wxWindowMac::SetFocus()
         return ;
 
     SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
         return ;
 
     SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );

-
-#if !TARGET_API_MAC_OSX
-    // emulate carbon events when running under CarbonLib where they are not natively available
-    if ( former )
-    {
-        EventRef evRef = NULL ;
-
-        err = MacCreateEvent(
-            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
-            kEventAttributeUserEvent , &evRef );
-        verify_noerr( err );
-
-        wxMacCarbonEvent cEvent( evRef ) ;
-        cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
-        cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
-
-        wxMacWindowEventHandler( NULL , evRef , former ) ;
-        ReleaseEvent( evRef ) ;
-    }
-
-    // send new focus event
-    {
-        EventRef evRef = NULL ;
-
-        err = MacCreateEvent(
-            NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
-            kEventAttributeUserEvent , &evRef );
-        verify_noerr( err );
-
-        wxMacCarbonEvent cEvent( evRef ) ;
-        cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
-        cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
-
-        wxMacWindowEventHandler( NULL , evRef , this ) ;
-        ReleaseEvent( evRef ) ;
-    }
-#endif

 }
 
 void wxWindowMac::DoCaptureMouse()
 }
 
 void wxWindowMac::DoCaptureMouse()


@@ -1350,7 +1216,7 @@ void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
 #endif
 
 // Old-style File Manager Drag & Drop
 #endif
 
 // Old-style File Manager Drag & Drop

-void wxWindowMac::DragAcceptFiles(bool accept)
+void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept))

 {
     // TODO:
 }
 {
     // TODO:
 }


@@ -1358,8 +1224,10 @@ void wxWindowMac::DragAcceptFiles(bool accept)
 // Returns the size of the native control. In the case of the toplevel window
 // this is the content area root control
 
 // Returns the size of the native control. In the case of the toplevel window
 // this is the content area root control
 

-void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
-                                           int& w, int& h) const
+void wxWindowMac::MacGetPositionAndSizeFromControl(int& WXUNUSED(x),
+                                                   int& WXUNUSED(y),
+                                                   int& WXUNUSED(w),
+                                                   int& WXUNUSED(h)) const

 {
     wxFAIL_MSG( wxT("Not currently supported") ) ;
 }
 {
     wxFAIL_MSG( wxT("Not currently supported") ) ;
 }


@@ -1719,24 +1587,18 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
         HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
         pt.h = hiPoint.x;
         pt.v = hiPoint.y;
         HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
         pt.h = hiPoint.x;
         pt.v = hiPoint.y;

- #else 
-        CGrafPtr savePort ;
-        Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
-
-        // TODO: If we ever get a GetCurrentEvent... replacement
-        // for the mouse position, use it...
-
-
-        GetMouse( &pt ) ;
+ #else
+        GetGlobalMouse( &pt );
+        int x = pt.h;
+        int y = pt.v;
+        ScreenToClient(&x, &y);
+        pt.h = x;
+        pt.v = y;

 #endif
 #endif

-        control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ;
+        control = FindControlUnderMouse( pt , window , &part ) ;

         if ( control )
             mouseWin = wxFindControlFromMacControl( control ) ;
 
         if ( control )
             mouseWin = wxFindControlFromMacControl( control ) ;
 

-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
-         if ( swapped )
-            QDSwapPort( savePort , NULL ) ;
-#endif

     }
 
     if ( mouseWin == this && !wxIsBusy() )
     }
 
     if ( mouseWin == this && !wxIsBusy() )


@@ -1748,7 +1610,8 @@ bool wxWindowMac::SetCursor(const wxCursor& cursor)
 #if wxUSE_MENUS
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {
 #if wxUSE_MENUS
 bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
 {

-    menu->SetInvokingWindow(this);
+#ifndef __WXUNIVERSAL__
+    menu->SetInvokingWindow((wxWindow*)this);

     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )
     menu->UpdateUI();
 
     if ( x == wxDefaultCoord && y == wxDefaultCoord )


@@ -1785,6 +1648,10 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->SetInvokingWindow( NULL );
 
   return true;
     menu->SetInvokingWindow( NULL );
 
   return true;

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

 }
 #endif
 
 }
 #endif
 


@@ -1809,12 +1676,12 @@ void wxWindowMac::MacInvalidateBorders()
     if ( m_peer == NULL )
         return ;
 
     if ( m_peer == NULL )
         return ;
 

-    bool vis = MacIsReallyShown() ;
+    bool vis = IsShownOnScreen() ;

     if ( !vis )
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;
     if ( !vis )
         return ;
 
     int outerBorder = MacGetLeftBorderSize() ;

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

         outerBorder += 4 ;
 
     if ( outerBorder == 0 )
         outerBorder += 4 ;
 
     if ( outerBorder == 0 )


@@ -1836,13 +1703,7 @@ void wxWindowMac::MacInvalidateBorders()
     RectRgn( updateOuter, &rect ) ;
     DiffRgn( updateOuter, updateInner , updateOuter ) ;
 
     RectRgn( updateOuter, &rect ) ;
     DiffRgn( updateOuter, updateInner , updateOuter ) ;
 

-#ifdef __WXMAC_OSX__

     GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
     GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;

-#else
-    WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ;
-    if ( tlw )
-        InvalWindowRgn( tlw , updateOuter ) ;
-#endif

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


@@ -1916,7 +1777,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             wxPoint point(actualX, actualY);
             wxMoveEvent event(point, m_windowId);
             event.SetEventObject(this);
             wxPoint point(actualX, actualY);
             wxMoveEvent event(point, m_windowId);
             event.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(event) ;
+            HandleWindowEvent(event) ;

         }
 
         if ( doResize )
         }
 
         if ( doResize )


@@ -1925,7 +1786,7 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
             wxSize size(actualWidth, actualHeight);
             wxSizeEvent event(size, m_windowId);
             event.SetEventObject(this);
             wxSize size(actualWidth, actualHeight);
             wxSizeEvent event(size, m_windowId);
             event.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(event);
+            HandleWindowEvent(event);

         }
     }
 }
         }
     }
 }


@@ -2078,12 +1939,14 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
 
 void wxWindowMac::SetLabel(const wxString& title)
 {

-    m_label = wxStripMenuCodes(title, wxStrip_Mnemonics) ;
+    m_label = title ;

 
     if ( m_peer && m_peer->Ok() )
 
     if ( m_peer && m_peer->Ok() )

-        m_peer->SetLabel( m_label ) ;
+        m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;

 
 

-    Refresh() ;
+    // do not trigger refreshes upon invisible and possible partly created objects
+    if ( IsShownOnScreen() )
+        Refresh() ;

 }
 
 wxString wxWindowMac::GetLabel() const
 }
 
 wxString wxWindowMac::GetLabel() const


@@ -2093,91 +1956,18 @@ wxString wxWindowMac::GetLabel() const
 
 bool wxWindowMac::Show(bool show)
 {
 
 bool wxWindowMac::Show(bool show)
 {

-    bool former = MacIsReallyShown() ;

     if ( !wxWindowBase::Show(show) )
         return false;
 
     if ( !wxWindowBase::Show(show) )
         return false;
 

-    // TODO: use visibilityChanged Carbon Event for OSX

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

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

     return true;
 }
 
     return true;
 }
 

-bool wxWindowMac::Enable(bool enable)
+void wxWindowMac::DoEnable(bool enable)

 {
 {

-    wxASSERT( m_peer->Ok() ) ;
-    bool former = MacIsReallyEnabled() ;
-    if ( !wxWindowBase::Enable(enable) )
-        return false;
-

     m_peer->Enable( enable ) ;
     m_peer->Enable( enable ) ;

-
-    if ( former != MacIsReallyEnabled() )
-        MacPropagateEnabledStateChanged() ;
-
-    return true;
-}
-
-//
-// status change propagations (will be not necessary for OSX later )
-//
-
-void wxWindowMac::MacPropagateVisibilityChanged()
-{
-#if !TARGET_API_MAC_OSX
-    MacVisibilityChanged() ;
-
-    wxWindowMac *child;
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while ( node )
-    {
-        child = node->GetData();
-        if ( child->IsShown() )
-            child->MacPropagateVisibilityChanged() ;
-
-        node = node->GetNext();
-    }
-#endif
-}
-
-void wxWindowMac::MacPropagateEnabledStateChanged()
-{
-#if !TARGET_API_MAC_OSX
-    MacEnabledStateChanged() ;
-
-    wxWindowMac *child;
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while ( node )
-    {
-        child = node->GetData();
-        if ( child->IsEnabled() )
-            child->MacPropagateEnabledStateChanged() ;
-
-        node = node->GetNext();
-    }
-#endif
-}
-
-void wxWindowMac::MacPropagateHiliteChanged()
-{
-#if !TARGET_API_MAC_OSX
-    MacHiliteChanged() ;
-
-    wxWindowMac *child;
-    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-    while ( node )
-    {
-        child = node->GetData();
-        if (child /* && child->IsEnabled() */)
-            child->MacPropagateHiliteChanged() ;
-
-        node = node->GetNext();
-    }
-#endif

 }
 
 //
 }
 
 //


@@ -2194,37 +1984,13 @@ void wxWindowMac::MacHiliteChanged()
 
 void wxWindowMac::MacEnabledStateChanged()
 {
 
 void wxWindowMac::MacEnabledStateChanged()
 {

+    OnEnabled( m_peer->IsEnabled() );

 }
 
 //
 // status queries on the inherited window's state
 //
 
 }
 
 //
 // status queries on the inherited window's state
 //
 

-bool wxWindowMac::MacIsReallyShown()
-{
-    // 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
-
-    wxWindow* win = this ;
-    while ( win->IsShown() )
-    {
-        if ( win->IsTopLevel() )
-            return true ;
-
-        win = win->GetParent() ;
-        if ( win == NULL )
-            return true ;
-    }
-
-    return false ;
-}
-

 bool wxWindowMac::MacIsReallyEnabled()
 {
     return m_peer->IsEnabled() ;
 bool wxWindowMac::MacIsReallyEnabled()
 {
     return m_peer->IsEnabled() ;


@@ -2264,7 +2030,7 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
         fontToUse = &m_font;
 
     wxClientDC dc( (wxWindowMac*) this ) ;
         fontToUse = &m_font;
 
     wxClientDC dc( (wxWindowMac*) this ) ;

-    long lx,ly,ld,le ;
+    wxCoord lx,ly,ld,le ;

     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
         *externalLeading = le ;
     dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
     if ( externalLeading )
         *externalLeading = le ;


@@ -2281,12 +2047,12 @@ void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
  * we always intersect with the entire window, not only with the client area
  */
 
  * we always intersect with the entire window, not only with the client area
  */
 

-void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
+void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)

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

-    if ( !MacIsReallyShown() )
+    if ( !IsShownOnScreen() )

         return ;
 
     if ( rect )
         return ;
 
     if ( rect )


@@ -2302,38 +2068,25 @@ void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
     }
 }
 
     }
 }
 

-void wxWindowMac::Freeze()
+void wxWindowMac::DoFreeze()

 {
 #if TARGET_API_MAC_OSX
 {
 #if TARGET_API_MAC_OSX

-    if ( !m_frozenness++ )
-    {
-        if ( m_peer && m_peer->Ok() )
-            m_peer->SetDrawingEnabled( false ) ;
-    }
+    if ( m_peer && m_peer->Ok() )
+        m_peer->SetDrawingEnabled( false ) ;

 #endif
 }
 
 #endif
 }
 

-void wxWindowMac::Thaw()
+void wxWindowMac::DoThaw()

 {
 #if TARGET_API_MAC_OSX
 {
 #if TARGET_API_MAC_OSX

-    wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") );
-
-    if ( !--m_frozenness )
+    if ( m_peer && m_peer->Ok() )

     {
     {

-        if ( m_peer && m_peer->Ok() )
-        {
-            m_peer->SetDrawingEnabled( true ) ;
-            m_peer->InvalidateWithChildren() ;
-        }
+        m_peer->SetDrawingEnabled( true ) ;
+        m_peer->InvalidateWithChildren() ;

     }
 #endif
 }
 
     }
 #endif
 }
 

-bool wxWindowMac::IsFrozen() const
-{
-    return m_frozenness != 0;
-}
-

 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept
 wxWindowMac *wxGetActiveWindow()
 {
     // actually this is a windows-only concept


@@ -2341,7 +2094,7 @@ wxWindowMac *wxGetActiveWindow()
 }
 
 // Coordinates relative to the window
 }
 
 // Coordinates relative to the window

-void wxWindowMac::WarpPointer(int x_pos, int y_pos)
+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.
 }


@@ -2350,17 +2103,28 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
 {
     if ( MacGetTopLevelWindow() == NULL )
         return ;
 {
     if ( MacGetTopLevelWindow() == NULL )
         return ;

-
+/*

 #if TARGET_API_MAC_OSX
 #if TARGET_API_MAC_OSX

-    if ( !m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
+    if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )

     {
     {

-        event.Skip() ;

     }
     else
 #endif
     }
     else
 #endif

+*/
+    if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )

     {
         event.GetDC()->Clear() ;
     }
     {
         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 )
 }
 
 void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )


@@ -2418,7 +2182,7 @@ int wxWindowMac::GetScrollThumb(int orient) const
     return 0;
 }
 
     return 0;
 }
 

-void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
+void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))

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


@@ -2432,25 +2196,76 @@ void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh)
     }
 }
 
     }
 }
 

+void
+wxWindowMac::AlwaysShowScrollbars(bool hflag, bool vflag)
+{
+    bool needVisibilityUpdate = false;
+
+    if ( m_hScrollBarAlwaysShown != hflag )
+    {
+        m_hScrollBarAlwaysShown = hflag;
+        needVisibilityUpdate = true;
+    }
+
+    if ( m_vScrollBarAlwaysShown != vflag )
+    {
+        m_vScrollBarAlwaysShown = vflag;
+        needVisibilityUpdate = true;
+    }
+
+    if ( needVisibilityUpdate )
+        DoUpdateScrollbarVisibility();
+}
+

 //
 // we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef
 // our own window origin is at leftOrigin/rightOrigin
 //
 
 //
 // we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef
 // our own window origin is at leftOrigin/rightOrigin
 //
 

-void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
+void  wxWindowMac::MacPaintGrowBox()
+{
+    if ( IsTopLevel() )
+        return ;
+
+    if ( MacHasScrollBarCorner() )
+    {
+        Rect rect ;
+
+        CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
+        wxASSERT( cgContext ) ;
+
+        m_peer->GetRect( &rect ) ;
+
+        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() )
+        {
+            CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
+        }
+        else
+        {
+            CGContextSetRGBFillColor( cgContext, (CGFloat) 1.0, (CGFloat)1.0 ,(CGFloat) 1.0 , (CGFloat)1.0 );
+        }
+        CGContextFillRect( cgContext, cgrect );
+        CGContextRestoreGState( cgContext );
+    }
+}
+
+void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )

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

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

 
     // back to the surrounding frame rectangle
     m_peer->GetRect( &rect ) ;
     InsetRect( &rect, -1 , -1 ) ;
 
 
     // back to the surrounding frame rectangle
     m_peer->GetRect( &rect ) ;
     InsetRect( &rect, -1 , -1 ) ;
 

-#if wxMAC_USE_CORE_GRAPHICS 

     {
         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 ) ;


@@ -2480,11 +2295,12 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
         {
             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 ) ;
         m_peer->GetRect( &rect ) ;

-        if ( hasBothScrollbars )
+        if ( MacHasScrollBarCorner() )

         {
         {

-            int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ;
+            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 ;
             CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
             CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
             HIThemeGrowBoxDrawInfo info ;


@@ -2492,36 +2308,13 @@ void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
             info.kind = kHIThemeGrowBoxKindNone ;
             info.version = 0 ;
             info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
             info.kind = kHIThemeGrowBoxKindNone ;

+            // contrary to the docs ...SizeSmall does not work

             info.size = kHIThemeGrowBoxSizeNormal ;
             info.size = kHIThemeGrowBoxSizeNormal ;

-            info.direction = kThemeGrowRight | kThemeGrowDown ;
+            info.direction = 0 ;

             HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
         }
             HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
         }

-    }
- #else
-    {
-        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
-        if ( top )
-        {
-            wxPoint pt(0, 0) ;
-            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 ( hasFocus )
-            DrawThemeFocusRect( &rect , true ) ;
-
-        if ( hasBothScrollbars )
-        {
-            // GetThemeStandaloneGrowBoxBounds
-            // DrawThemeStandaloneNoGrowBox
-        }
-    }

 #endif
 #endif

+    }

 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )
 }
 
 void wxWindowMac::RemoveChild( wxWindowBase *child )


@@ -2534,39 +2327,29 @@ void wxWindowMac::RemoveChild( wxWindowBase *child )
     wxWindowBase::RemoveChild( child ) ;
 }
 
     wxWindowBase::RemoveChild( child ) ;
 }
 

-// New function that will replace some of the above.
-void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
-    int range, bool refresh)
+void wxWindowMac::DoUpdateScrollbarVisibility()

 {
 {

-    bool showScroller;

     bool triggerSizeEvent = false;
 
     bool triggerSizeEvent = false;
 

-    if ( orient == wxHORIZONTAL )
+    if ( m_hScrollBar )

     {
     {

-        if ( m_hScrollBar )
-        {
-            showScroller = ((range != 0) && (range > thumbVisible));
-            if ( m_hScrollBar->IsShown() != showScroller )
-            {
-                m_hScrollBar->Show( showScroller );
-                triggerSizeEvent = true;
-            }
+        bool showHScrollBar = m_hScrollBarAlwaysShown || m_hScrollBar->IsNeeded();

 
 

-            m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
+        if ( m_hScrollBar->IsShown() != showHScrollBar )
+        {
+            m_hScrollBar->Show( showHScrollBar );
+            triggerSizeEvent = true;

         }
     }
         }
     }

-    else
+
+    if ( m_vScrollBar)

     {
     {

-        if ( m_vScrollBar )
-        {
-            showScroller = ((range != 0) && (range > thumbVisible));
-            if ( m_vScrollBar->IsShown() != showScroller )
-            {
-                m_vScrollBar->Show( showScroller ) ;
-                triggerSizeEvent = true;
-            }
+        bool showVScrollBar = m_vScrollBarAlwaysShown || m_vScrollBar->IsNeeded();

 
 

-            m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
+        if ( m_vScrollBar->IsShown() != showVScrollBar )
+        {
+            m_vScrollBar->Show( showVScrollBar ) ;
+            triggerSizeEvent = true;

         }
     }
 
         }
     }
 


@@ -2575,10 +2358,22 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     {
         wxSizeEvent event(GetSize(), m_windowId);
         event.SetEventObject(this);
     {
         wxSizeEvent event(GetSize(), m_windowId);
         event.SetEventObject(this);

-        GetEventHandler()->ProcessEvent(event);
+        HandleWindowEvent(event);

     }
 }
 
     }
 }
 

+// New function that will replace some of the above.
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
+                               int range, bool refresh)
+{
+    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();
+}
+

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


@@ -2599,19 +2394,14 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         if ( m_peer->GetNeedsDisplay() )
         {
             // because HIViewScrollRect does not scroll the already invalidated area we have two options:
         if ( m_peer->GetNeedsDisplay() )
         {
             // because HIViewScrollRect does not scroll the already invalidated area we have two options:

+            // in case there is already a pending redraw on that area

             // either immediate redraw or full invalidate
 #if 1
             // 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
             // either immediate redraw or full invalidate
 #if 1
             // 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

-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
-            if ( UMAGetSystemVersion() >= 0x1030 )
-                HIViewRender(m_peer->GetControlRef()) ;
-            else
-#endif
-                Update() ;
+            HIViewRender(m_peer->GetControlRef()) ;

 #endif
         }
 
 #endif
         }
 


@@ -2619,14 +2409,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
         m_peer->ScrollRect( &scrollrect , dx , dy ) ;
 
         scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
         m_peer->ScrollRect( &scrollrect , dx , dy ) ;
 

-        // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
-        // either immediate redraw or full invalidate

 #if 0
 #if 0

-        // 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

-

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


@@ -2651,11 +2435,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
         {
             wxRect rc( x, y, w, h );
             if (rect->Intersects( rc ))
         {
             wxRect rc( x, y, w, h );
             if (rect->Intersects( rc ))

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

         }
         else
         {
         }
         else
         {

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

         }
     }
 }
         }
     }
 }


@@ -2686,7 +2470,7 @@ void wxWindowMac::MacOnScroll( wxScrollEvent &event )
         else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
             wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
 
         else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
             wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
 

-        GetEventHandler()->ProcessEvent(wevent);
+        HandleWindowEvent(wevent);

     }
 }
 
     }
 }
 


@@ -2698,62 +2482,11 @@ wxWindowMac *wxWindowBase::DoFindFocus()
     return wxFindControlFromMacControl( control ) ;
 }
 
     return wxFindControlFromMacControl( control ) ;
 }
 

-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
-    //
-    // 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
-
-    // CS: don't know if this is still needed:
-    //wxChildFocusEvent eventFocus(this);
-    //(void)GetEventHandler()->ProcessEvent(eventFocus);
-
-    if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
-    {
-#if wxMAC_USE_CORE_GRAPHICS
-        GetParent()->Refresh() ;
-#else
-        wxMacWindowStateSaver sv( this ) ;
-        Rect rect ;
-
-        m_peer->GetRect( &rect ) ;
-        // auf den umgebenden Rahmen zur\9fck
-        InsetRect( &rect, -1 , -1 ) ;
-
-        wxTopLevelWindowMac* top = MacGetTopLevelWindow();
-        if ( top )
-        {
-            wxPoint pt(0, 0) ;
-            wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
-            rect.left += pt.x ;
-            rect.right += pt.x ;
-            rect.top += pt.y ;
-            rect.bottom += pt.y ;
-        }
-
-        bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
-        DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
-        if ( !bIsFocusEvent )
-        {
-            // 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() ;
-        }
-#endif
-    }
-
-    event.Skip();
-}
-

 void wxWindowMac::OnInternalIdle()
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)
 void wxWindowMac::OnInternalIdle()
 {
     // This calls the UI-update mechanism (querying windows for
     // menu/toolbar/control state information)

-    if (wxUpdateUIEvent::CanUpdate(this))
+    if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())

         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 
         UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
 }
 


@@ -2782,7 +2515,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
     {
         wxSetCursorEvent event( pt.x , pt.y );
 
     {
         wxSetCursorEvent event( pt.x , pt.y );
 

-        bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+        bool processedEvtSetCursor = HandleWindowEvent(event);

         if ( processedEvtSetCursor && event.HasCursor() )
         {
             cursor = event.GetCursor() ;
         if ( processedEvtSetCursor && event.HasCursor() )
         {
             cursor = event.GetCursor() ;


@@ -2807,7 +2540,7 @@ bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
     return cursor.Ok() ;
 }
 
     return cursor.Ok() ;
 }
 

-wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
+wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )

 {
 #if wxUSE_TOOLTIPS
     if ( m_tooltip )
 {
 #if wxUSE_TOOLTIPS
     if ( m_tooltip )


@@ -2825,11 +2558,9 @@ void wxWindowMac::ClearBackground()
 
 void wxWindowMac::Update()
 {
 
 void wxWindowMac::Update()
 {

-#if TARGET_API_MAC_OSX
-    MacGetTopLevelWindow()->MacPerformUpdates() ;
-#else
-    ::Draw1Control( m_peer->GetControlRef() ) ;
-#endif
+    wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+    if (top)
+        top->MacPerformUpdates() ;

 }
 
 wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
 }
 
 wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const


@@ -2867,7 +2598,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
 {
     static wxRegion emptyrgn ;
 
 {
     static wxRegion emptyrgn ;
 

-    if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ )
+    if ( !m_isBeingDeleted && IsShownOnScreen() )

     {
         MacUpdateClippedRects() ;
         if ( includeOuterStructures )
     {
         MacUpdateClippedRects() ;
         if ( includeOuterStructures )


@@ -2971,7 +2702,7 @@ void wxWindowMac::MacUpdateClippedRects() const
 /*
     This function must not change the updatergn !
  */
 /*
     This function must not change the updatergn !
  */

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

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


@@ -2996,19 +2727,21 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
             // the grow-box area of a scrolled window (scroll sample)
             wxDC* dc = new wxWindowDC(this);
             if ( IsTopLevel() )
             // the grow-box area of a scrolled window (scroll sample)
             wxDC* dc = new wxWindowDC(this);
             if ( IsTopLevel() )

-                dc->SetClippingRegion(wxRegion(updatergn));
+                dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));

             else
             else

-                dc->SetClippingRegion(wxRegion(newupdate));
+                dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));

 
             wxEraseEvent eevent( GetId(), dc );
             eevent.SetEventObject( this );
 
             wxEraseEvent eevent( GetId(), dc );
             eevent.SetEventObject( this );

-            GetEventHandler()->ProcessEvent( eevent );
+            HandleWindowEvent( eevent );

             delete dc ;
         }
 
             delete dc ;
         }
 

+        MacPaintGrowBox();
+

         // calculate a client-origin version of the update rgn and set m_updateRegion to that
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;
         // calculate a client-origin version of the update rgn and set m_updateRegion to that
         OffsetRgn( newupdate , -origin.x , -origin.y ) ;

-        m_updateRegion = newupdate ;
+        m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;

         DisposeRgn( newupdate ) ;
 
         if ( !m_updateRegion.Empty() )
         DisposeRgn( newupdate ) ;
 
         if ( !m_updateRegion.Empty() )


@@ -3018,7 +2751,7 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
             wxPaintEvent event;
             event.SetTimestamp(time);
             event.SetEventObject(this);
             wxPaintEvent event;
             event.SetTimestamp(time);
             event.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(event);
+            HandleWindowEvent(event);

             handled = true ;
         }
 
             handled = true ;
         }
 


@@ -3057,18 +2790,9 @@ bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
                 // paint custom borders
                 wxNcPaintEvent eventNc( child->GetId() );
                 eventNc.SetEventObject( child );
                 // paint custom borders
                 wxNcPaintEvent eventNc( child->GetId() );
                 eventNc.SetEventObject( child );

-                if ( !child->GetEventHandler()->ProcessEvent( eventNc ) )
+                if ( !child->HandleWindowEvent( eventNc ) )

                 {
                 {

-#if wxMAC_USE_CORE_GRAPHICS 

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

-#else
-                    {
-                        wxWindowDC dc(this) ;
-                        dc.SetClippingRegion(wxRegion(updatergn));
-                        wxMacPortSetter helper(&dc) ;
-                        child->MacPaintBorders(0, 0) ;
-                    }
-#endif

                 }
             }
         }
                 }
             }
         }


@@ -3085,28 +2809,99 @@ WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
     while ( iter )
     {
         if ( iter->IsTopLevel() )
     while ( iter )
     {
         if ( iter->IsTopLevel() )

-            return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
-
+        {
+            wxTopLevelWindow* toplevel = wxDynamicCast(iter,wxTopLevelWindow);
+            if ( toplevel )
+                return toplevel->MacGetWindowRef();
+#if wxUSE_POPUPWIN
+            wxPopupWindow* popupwin = wxDynamicCast(iter,wxPopupWindow);
+            if ( popupwin )
+                return popupwin->MacGetPopupWindowRef();
+#endif
+        }

         iter = iter->GetParent() ;
     }
 
     return NULL ;
 }
 
         iter = iter->GetParent() ;
     }
 
     return NULL ;
 }
 

+bool wxWindowMac::MacHasScrollBarCorner() const
+{
+    /* Returns whether the scroll bars in a wxScrolledWindow should be
+     * shortened. Scroll bars should be shortened if either:
+     *
+     * - both scroll bars are visible, or
+     *
+     * - there is a resize box in the parent frame's corner and this
+     *   window shares the bottom and right edge with the parent
+     *   frame.
+     */
+
+    if ( m_hScrollBar == NULL && m_vScrollBar == NULL )
+        return false;
+
+    if ( ( m_hScrollBar && m_hScrollBar->IsShown() )
+         && ( m_vScrollBar && m_vScrollBar->IsShown() ) )
+    {
+        // Both scroll bars visible
+        return true;
+    }
+    else
+    {
+        wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight();
+
+        for ( const wxWindow *win = this; win; win = win->GetParent() )
+        {
+            const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
+            if ( frame )
+            {
+                if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+                {
+                    // Parent frame has resize handle
+                    wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
+
+                    // Note: allow for some wiggle room here as wxMac's
+                    // window rect calculations seem to be imprecise
+                    if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2
+                        && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 )
+                    {
+                        // Parent frame has resize handle and shares
+                        // right bottom corner
+                        return true ;
+                    }
+                    else
+                    {
+                        // Parent frame has resize handle but doesn't
+                        // share right bottom corner
+                        return false ;
+                    }
+                }
+                else
+                {
+                    // Parent frame doesn't have resize handle
+                    return false ;
+                }
+            }
+        }
+
+        // No parent frame found
+        return false ;
+    }
+}
+

 void wxWindowMac::MacCreateScrollBars( long style )
 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )
     {
 void wxWindowMac::MacCreateScrollBars( long style )
 {
     wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
 
     if ( style & ( wxVSCROLL | wxHSCROLL ) )
     {

-        bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;

         int scrlsize = MAC_SCROLLBAR_SIZE ;
         if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         {
             scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
         }
 
         int scrlsize = MAC_SCROLLBAR_SIZE ;
         if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
         {
             scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
         }
 

-        int adjust = hasBoth ? scrlsize - 1: 0 ;
+        int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ;

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


@@ -3115,11 +2910,18 @@ 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) ;
 

+        // we have to set the min size to a smaller value, otherwise they cannot get smaller (InitialSize sets MinSize)

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

-            m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);
+        {
+            m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL);
+            m_vScrollBar->SetMinSize( wxDefaultSize );
+        }

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

-            m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
+        {
+            m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
+            m_hScrollBar->SetMinSize( wxDefaultSize );
+        }

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


@@ -3139,9 +2941,8 @@ 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()) ;

     int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
     int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;

-    int adjust = hasBoth ? scrlsize - 1 : 0 ;
+    int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ;

 
     // get real client area
     int width, height ;
 
     // get real client area
     int width, height ;


@@ -3324,7 +3125,8 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
         wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
                                   this->GetId(),
                                   this->ClientToScreen(event.GetPosition()));
         wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
                                   this->GetId(),
                                   this->ClientToScreen(event.GetPosition()));

-        if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+        evtCtx.SetEventObject(this);
+        if ( ! HandleWindowEvent(evtCtx) )

             event.Skip() ;
     }
     else
             event.Skip() ;
     }
     else


@@ -3333,15 +3135,18 @@ void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
     }
 }
 
     }
 }
 

-void wxWindowMac::OnPaint( wxPaintEvent & event )
+void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )

 {
 {

-    if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
+    if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
+         && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )

         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 WXUNUSED(control),
+                                        wxInt16 WXUNUSED(controlpart),
+                                        bool WXUNUSED(mouseStillDown))

 {
 }
 
 {
 }
 


@@ -3378,29 +3183,49 @@ bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
 
 bool wxWindowMac::SetTransparent(wxByte alpha)
 {
 
 bool wxWindowMac::SetTransparent(wxByte alpha)
 {

-#if wxMAC_USE_CORE_GRAPHICS
+    SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+

     if ( alpha != m_macAlpha )
     {
         m_macAlpha = alpha ;
         Refresh() ;
     }
     return true ;
     if ( alpha != m_macAlpha )
     {
         m_macAlpha = alpha ;
         Refresh() ;
     }
     return true ;

-#else
-    return false ;
-#endif

 }
 
 
 bool wxWindowMac::CanSetTransparent()
 {
 }
 
 
 bool wxWindowMac::CanSetTransparent()
 {

-#if wxMAC_USE_CORE_GRAPHICS

     return true ;
     return true ;

-#else
-    return false ;
-#endif

 }
 
 }
 

-wxByte wxWindowMac::GetTransparent() const 
+wxByte wxWindowMac::GetTransparent() const

 {
     return m_macAlpha ;
 }
 {
     return m_macAlpha ;
 }

+
+bool wxWindowMac::IsShownOnScreen() const
+{
+#if TARGET_API_MAC_OSX
+    if ( m_peer && m_peer->Ok() )
+    {
+        bool peerVis = m_peer->IsVisible();
+        bool wxVis = wxWindowBase::IsShownOnScreen();
+        if( peerVis != wxVis )
+        {
+            // CS : put a breakpoint here to investigate differences
+            // between native an wx visibilities
+            // the only place where I've encountered them until now
+            // are the hiding/showing sequences where the vis-changed event is 
+            // first sent to the innermost control, while wx does things
+            // from the outmost control
+            wxVis = wxWindowBase::IsShownOnScreen();
+            return wxVis;
+        }
+        
+        return m_peer->IsVisible();
+    }
+#endif
+
+    return wxWindowBase::IsShownOnScreen();
+}