adding support for embedded controls in native toolbar

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

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 6093f5494ea068870812b44dd11a7ce34e091ccd..1a23e540470b709213ef0fbf1ab7301453ec0dd4 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -17,29 +17,27 @@
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/utils.h"

+    #include "wx/panel.h"
+    #include "wx/frame.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+    #include "wx/button.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
+    #include "wx/scrolbar.h"
+    #include "wx/statbox.h"
+    #include "wx/textctrl.h"
+    #include "wx/toolbar.h"
+    #include "wx/layout.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"

 #endif
 
 #endif
 

-#include "wx/menu.h"
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/panel.h"
-#include "wx/layout.h"
-#include "wx/dialog.h"
-#include "wx/scrolbar.h"
-#include "wx/statbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/msgdlg.h"
-#include "wx/frame.h"

 #include "wx/tooltip.h"
 #include "wx/tooltip.h"

-#include "wx/statusbr.h"
-#include "wx/menuitem.h"

 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"

-#include "wx/textctrl.h"
-
-#include "wx/toolbar.h"
-#include "wx/dc.h"

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


@@ -69,8 +67,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern wxList wxPendingDelete;
-

 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else
 #ifdef __WXUNIVERSAL__
     IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
 #else


@@ -207,43 +203,22 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
                 Rect controlBounds ;
 
                 wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
                 Rect controlBounds ;
 

-                if ( ! thisWindow->GetPeer()->IsCompositing() )
-                {
-                    if ( thisWindow->GetPeer()->IsRootControl() )
-                        thisWindow->GetPeer()->GetRect( &controlBounds ) ;
-                    else
-                        GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;
-                }
-

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

-                    if ( ! thisWindow->GetPeer()->IsCompositing() )
+                    if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )

                     {
                     {

+                        // as this update region is in native window locals we must adapt it to wx window local

                         allocatedRgn = NewRgn() ;
                         CopyRgn( updateRgn , allocatedRgn ) ;
                         allocatedRgn = NewRgn() ;
                         CopyRgn( updateRgn , allocatedRgn ) ;

-                        OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ;

 
                         // hide the given region by the new region that must be shifted
                         wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
                         updateRgn = allocatedRgn ;
                     }
 
                         // hide the given region by the new region that must be shifted
                         wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
                         updateRgn = allocatedRgn ;
                     }

-                    else
-                    {
-                        if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
-                        {
-                            // as this update region is in native window locals we must adapt it to wx window local
-                            allocatedRgn = NewRgn() ;
-                            CopyRgn( updateRgn , allocatedRgn ) ;
-
-                            // hide the given region by the new region that must be shifted
-                            wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
-                            updateRgn = allocatedRgn ;
-                        }
-                    }

                 }
 
                 Rect rgnBounds ;
                 }
 
                 Rect rgnBounds ;


@@ -276,43 +251,25 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
 #if wxMAC_USE_CORE_GRAPHICS
                     bool created = false ;
                     CGContextRef cgContext = NULL ;
 #if wxMAC_USE_CORE_GRAPHICS
                     bool created = false ;
                     CGContextRef cgContext = NULL ;

-                    if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
-                    {
-                        wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;
-
-                        // this parameter is not provided on non-composited windows
-                        created = true ;
-
-                        // rest of the code expects this to be already transformed and clipped for local
-                        CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ;
-                        Rect bounds ;
-                        GetPortBounds( port , &bounds ) ;
-                        CreateCGContextForPort( port , &cgContext ) ;
-
-                        wxMacWindowToNative( thisWindow , updateRgn ) ;
-                        OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ;
-                        ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ;
-                        wxMacNativeToWindow( thisWindow , updateRgn ) ;
-                        OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ;
-
-                        CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
-                        CGContextScaleCTM( cgContext , 1 , -1 ) ;
-
-                        CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ;
-
-#if 0
-                        CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;
-                        CGContextFillRect( cgContext ,
-                            CGRectMake( 0 , 0 ,
-                                controlBounds.right - controlBounds.left ,
-                                controlBounds.bottom - controlBounds.top ) );
-#endif
-                    }
-
+                    OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;
+                    wxASSERT_MSG( err == noErr , wxT("Unable to retrieve CGContextRef") ) ;

                     thisWindow->MacSetCGContextRef( cgContext ) ;
 
                     {
                         wxMacCGContextStateSaver sg( cgContext ) ;
                     thisWindow->MacSetCGContextRef( cgContext ) ;
 
                     {
                         wxMacCGContextStateSaver sg( cgContext ) ;

+                        float alpha = 1.0 ;
+                        {
+                            wxWindow* iter = thisWindow ;
+                            while ( iter ) 
+                            {
+                                alpha *= (float) iter->GetTransparent()/255.0 ;
+                                if ( iter->IsTopLevel() )
+                                    iter = NULL ;
+                                else
+                                    iter = iter->GetParent() ;
+                            }
+                        }
+                        CGContextSetAlpha( cgContext , alpha ) ;

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


@@ -945,6 +902,7 @@ void wxWindowMac::Init()
 {
     m_peer = NULL ;
     m_frozenness = 0 ;
 {
     m_peer = NULL ;
     m_frozenness = 0 ;

+    m_macAlpha = 255 ;

 
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = false;
 
 #if WXWIN_COMPATIBILITY_2_4
     m_backgroundTransparent = false;


@@ -997,11 +955,11 @@ wxWindowMac::~wxWindowMac()
     // wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
     // wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.

-    wxWindow *parent = GetParent() ;
-    if ( parent )
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )

     {
     {

-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem(NULL);
+        if ( tlw->GetDefaultItem() == (wxButton*) this)
+            tlw->SetDefaultItem(NULL);

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


@@ -1140,7 +1098,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 

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

 
     if (!m_macIsUserPane)
         SetInitialBestSize(size);
 
     if (!m_macIsUserPane)
         SetInitialBestSize(size);


@@ -1400,10 +1358,6 @@ bool wxWindowMac::MacGetBoundsForControl(
     w = wxMax(size.x, 0) ; // WidthDefault( size.x );
     h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
 
     w = wxMax(size.x, 0) ; // WidthDefault( size.x );
     h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
 

-    bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;
-    if ( !isCompositing )
-        GetParent()->MacWindowToRootWindow( &x , &y ) ;
-

     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;
     w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
     x += MacGetLeftBorderSize() ;
     y += MacGetTopBorderSize() ;
     w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;


@@ -1765,7 +1719,7 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 

-    if ( x == -1 && y == -1 )
+    if ( x == wxDefaultCoord && y == wxDefaultCoord )

     {
         wxPoint mouse = wxGetMousePosition();
         x = mouse.x;
     {
         wxPoint mouse = wxGetMousePosition();
         x = mouse.x;


@@ -2092,7 +2046,7 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
 
 void wxWindowMac::SetLabel(const wxString& title)
 {

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

 
     if ( m_peer && m_peer->Ok() )
         m_peer->SetLabel( m_label ) ;
 
     if ( m_peer && m_peer->Ok() )
         m_peer->SetLabel( m_label ) ;


@@ -2361,7 +2315,7 @@ void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
         return ;
 
 #if TARGET_API_MAC_OSX
         return ;
 
 #if TARGET_API_MAC_OSX

-    if ( MacGetTopLevelWindow()->MacUsesCompositing() && (!m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) )
+    if ( !m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )

     {
         event.Skip() ;
     }
     {
         event.Skip() ;
     }


@@ -2549,6 +2503,7 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
     int range, bool refresh)
 {
     bool showScroller;
     int range, bool refresh)
 {
     bool showScroller;

+    bool triggerSizeEvent = false;

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


@@ -2556,7 +2511,10 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_hScrollBar->IsShown() != showScroller )
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_hScrollBar->IsShown() != showScroller )

-                m_hScrollBar->Show( showScroller ) ;
+            {
+                m_hScrollBar->Show( showScroller );
+                triggerSizeEvent = true;
+            }

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


@@ -2567,13 +2525,22 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_vScrollBar->IsShown() != showScroller )
         {
             showScroller = ((range != 0) && (range > thumbVisible));
             if ( m_vScrollBar->IsShown() != showScroller )

+            {

                 m_vScrollBar->Show( showScroller ) ;
                 m_vScrollBar->Show( showScroller ) ;

+                triggerSizeEvent = true;
+            }

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

+    if ( triggerSizeEvent )
+    {
+        wxSizeEvent event(GetSize(), m_windowId);
+        event.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(event);
+    }

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


@@ -2586,7 +2553,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
     GetClientSize( &width , &height ) ;
 
 #if TARGET_API_MAC_OSX
     GetClientSize( &width , &height ) ;
 
 #if TARGET_API_MAC_OSX

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

     {
         // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
         // area is scrolled, this does not occur if width and height are 2 pixels less,
     {
         // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
         // area is scrolled, this does not occur if width and height are 2 pixels less,


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

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

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


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

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

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


@@ -3441,3 +3408,32 @@ bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
 
     return true;
 }
 
     return true;
 }

+
+bool wxWindowMac::SetTransparent(wxByte alpha)
+{
+#if wxMAC_USE_CORE_GRAPHICS
+    if ( alpha != m_macAlpha )
+    {
+        m_macAlpha = alpha ;
+        Refresh() ;
+    }
+    return true ;
+#else
+    return false ;
+#endif
+}
+
+
+bool wxWindowMac::CanSetTransparent()
+{
+#if wxMAC_USE_CORE_GRAPHICS
+    return true ;
+#else
+    return false ;
+#endif
+}
+
+wxByte wxWindowMac::GetTransparent() const 
+{
+    return m_macAlpha ;
+}
\ No newline at end of file