Enable UpdateUI events in wxTaskBarIcon.

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 8e85da2cf5f311eea8d19167278461ebc8ba8d2f..59657f38f55c78454b7ea1f5ba0a991c18ed0ad0 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -18,7 +18,8 @@
 #include "wx/region.h"
 #include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/region.h"
 #include "wx/window.h"
 #include "wx/toplevel.h"

-#include <math.h>
+#include "wx/settings.h"
+#include "wx/math.h"

 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------


@@ -42,48 +43,109 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
  */
 
 #include "wx/mac/uma.h"
  */
 
 #include "wx/mac/uma.h"

+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
+    
+
+static wxBrush MacGetBackgroundBrush( wxWindow* window )
+{
+    wxBrush bkdBrush = window->MacGetBackgroundBrush() ;
+#if !TARGET_API_MAC_OSX
+    // transparency cannot be handled by the OS when not using composited windows
+    wxWindow* parent = window->GetParent() ;
+    // if we have some 'pseudo' transparency
+    if ( ! bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT || window->GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+    {
+        // walk up until we find something
+        while( parent != NULL )
+        {
+            if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+            {
+                // if we have any other colours in the hierarchy
+                bkdBrush.SetColour( parent->GetBackgroundColour() ) ;
+                break ;
+            }
+            if ( parent->IsKindOf( CLASSINFO(wxTopLevelWindow) ) )
+            {
+                bkdBrush = parent->MacGetBackgroundBrush() ;
+                break ;
+            }
+            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ) )
+            {
+                Rect extent = { 0 , 0 , 0 , 0 } ;
+                int x , y ;
+                x = y = 0 ;
+                wxSize size = parent->GetSize() ;
+                parent->MacClientToRootWindow( &x , &y ) ;
+                extent.left = x ;
+                extent.top = y ;
+                extent.top-- ;
+                extent.right = x + size.x ;
+                extent.bottom = y + size.y ;
+                bkdBrush.MacSetThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; 
+                break ;
+            }
+            
+            parent = parent->GetParent() ;  
+        }
+    }
+    if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
+    {
+        // if we did not find something, use a default
+        bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
+    }
+#endif    
+    return bkdBrush ;
+}    
+

 
 wxWindowDC::wxWindowDC() 
 {
 
 wxWindowDC::wxWindowDC() 
 {

+    m_window = NULL ;

 }
 
 }
 

-wxWindowDC::wxWindowDC(wxWindow *the_canvas) 
+wxWindowDC::wxWindowDC(wxWindow *window) 

 {
 {

-    wxTopLevelWindowMac* rootwindow = the_canvas->MacGetTopLevelWindow() ;
+    m_window = window ;
+    wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;

     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     
     int x , y ;
     x = y = 0 ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     
     int x , y ;
     x = y = 0 ;

-    the_canvas->MacWindowToRootWindow( &x , &y ) ;
+    window->MacWindowToRootWindow( &x , &y ) ;

     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;
     m_macLocalOrigin.x = x ;
     m_macLocalOrigin.y = y ;

-    CopyRgn( (RgnHandle) the_canvas->MacGetVisibleRegion().GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;
+    CopyRgn( (RgnHandle) window->MacGetVisibleRegion(true).GetWXHRGN() , (RgnHandle) m_macBoundaryClipRgn ) ;

     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    m_minY = m_minX =  0;
-    wxSize size = the_canvas->GetSize() ;
-    m_maxX = size.x  ;
-    m_maxY = size.y ; 
-
-     m_ok = TRUE ;
-  SetBackground(the_canvas->MacGetBackgroundBrush());
+    m_ok = TRUE ;
+    SetBackground(MacGetBackgroundBrush(window));

 }
 
 wxWindowDC::~wxWindowDC()
 {
 }
 
 }
 
 wxWindowDC::~wxWindowDC()
 {
 }
 

+void wxWindowDC::DoGetSize( int* width, int* height ) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetSize(width, height);
+}
+

 /*
  * wxClientDC
  */
 
 wxClientDC::wxClientDC()
 {
 /*
  * wxClientDC
  */
 
 wxClientDC::wxClientDC()
 {

+    m_window = NULL ;

 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {
 }
 
 wxClientDC::wxClientDC(wxWindow *window)
 {

+    m_window = window ;

     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;


@@ -102,11 +164,9 @@ wxClientDC::wxClientDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    m_minY = m_minX =  0;
-    m_maxX = size.x  ;
-    m_maxY = size.y ; 
+

     m_ok = TRUE ;
     m_ok = TRUE ;

-    SetBackground(window->MacGetBackgroundBrush());
+    SetBackground(MacGetBackgroundBrush(window));

     SetFont( window->GetFont() ) ;
 }
 
     SetFont( window->GetFont() ) ;
 }
 


@@ -114,16 +174,26 @@ wxClientDC::~wxClientDC()
 {
 }
 
 {
 }
 

+void wxClientDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetClientSize( width, height );
+}
+
+

 /*
  * wxPaintDC
  */
 
 wxPaintDC::wxPaintDC()
 {
 /*
  * wxPaintDC
  */
 
 wxPaintDC::wxPaintDC()
 {

+    m_window = NULL ;

 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {
 }
 
 wxPaintDC::wxPaintDC(wxWindow *window)
 {

+    m_window = window ;

     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;


@@ -141,14 +211,21 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;

-    m_minY = m_minX =  0;
-    m_maxX = size.x  ;
-    m_maxY = size.y ; 
+

     m_ok = TRUE ;
     m_ok = TRUE ;

-    SetBackground(window->MacGetBackgroundBrush());
+    SetBackground(MacGetBackgroundBrush(window));

     SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()
 {
 }
     SetFont( window->GetFont() ) ;
 }
 
 wxPaintDC::~wxPaintDC()
 {
 }

+
+void wxPaintDC::DoGetSize(int *width, int *height) const
+{
+    wxCHECK_RET( m_window, _T("GetSize() doesn't work without window") );
+
+    m_window->GetClientSize( width, height );
+}
+
+