no changes, just corrected the comment for wxConvLocal

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

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 1164a856d4c62cf7cb6c324d95d1134c30baf243..7f14f9b53adbd3aa6b6e521a95c4fe026f82c961 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcclient.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/dcclient.h"
@@ -35,11 +31,9 @@
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
-#endif
 
 /*
  * wxWindowDC
@@ -53,14 +47,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
 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 )
+        while ( parent != NULL )
         {
             if ( parent->GetBackgroundColour() != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
             {
@@ -68,11 +64,13 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
                 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 } ;
@@ -92,16 +90,17 @@ static wxBrush MacGetBackgroundBrush( wxWindow* window )
             parent = parent->GetParent() ;  
         }
     }
+
     if ( !bkdBrush.Ok() || bkdBrush.GetStyle() == wxTRANSPARENT )
     {
         // if we did not find something, use a default
         bkdBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
     }
-#endif    
+#endif
+
     return bkdBrush ;
 }    
 
-
 wxWindowDC::wxWindowDC() 
 {
     m_window = NULL ;
@@ -113,13 +112,15 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
+
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     int x , y ;
     x = y = 0 ;
     wxSize size = window->GetSize() ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-    
+    m_ok = true ;
+
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
@@ -129,7 +130,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
-        SetBackground(MacGetBackgroundBrush(window));        
     }
     else
     {
@@ -141,7 +141,6 @@ wxWindowDC::wxWindowDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
-        SetBackground(MacGetBackgroundBrush(window));
     }
     // there is no out-of-order drawing on OSX
 #else
@@ -150,9 +149,9 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     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 ) ;
-    SetBackground(MacGetBackgroundBrush(window));
 #endif
-    m_ok = TRUE ;
+    SetBackground(MacGetBackgroundBrush(window));
+
     SetFont( window->GetFont() ) ;
 }
 
@@ -182,6 +181,7 @@ wxClientDC::wxClientDC(wxWindow *window)
     wxTopLevelWindowMac* rootwindow = window->MacGetTopLevelWindow() ;
     if (!rootwindow)
         return;
+
     WindowRef windowref = (WindowRef) rootwindow->MacGetWindowRef() ;
     wxPoint origin = window->GetClientAreaOrigin() ;
     wxSize size = window->GetClientSize() ;
@@ -190,7 +190,8 @@ wxClientDC::wxClientDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
-    
+    m_ok = true ;
+
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
@@ -199,20 +200,17 @@ wxClientDC::wxClientDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
-        m_ok = TRUE ;    
         SetClippingRegion( 0 , 0 , size.x , size.y ) ;
-        SetBackground(MacGetBackgroundBrush(window));
     }
     else
     {
-        // as out of order redraw is not supported under CQ, we have to create a qd port for these
-        // situations
+        // as out of order redraw is not supported under CQ,
+        // we have to create a QD port for these situations
         m_macLocalOrigin.x = x ;
         m_macLocalOrigin.y = y ;
         m_graphicContext = new wxMacCGContext( (CGrafPtr) m_macPort ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
-        m_ok = TRUE ;    
      }
 #else
     m_macLocalOrigin.x = x ;
@@ -222,14 +220,23 @@ wxClientDC::wxClientDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , -origin.x , -origin.y ) ;
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle)  m_macCurrentClipRgn ) ;
-    m_ok = TRUE ;
 #endif
+
     SetBackground(MacGetBackgroundBrush(window));
     SetFont( window->GetFont() ) ;
 }
 
 wxClientDC::~wxClientDC()
 {
+#if wxMAC_USE_CORE_GRAPHICS
+/*
+    if ( m_window->MacGetCGContextRef() == 0)
+    {
+        CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ;
+        CGContextFlush( cgContext ) ;
+    }
+*/
+#endif
 }
 
 void wxClientDC::DoGetSize(int *width, int *height) const
@@ -239,7 +246,6 @@ void wxClientDC::DoGetSize(int *width, int *height) const
     m_window->GetClientSize( width, height );
 }
 
-
 /*
  * wxPaintDC
  */
@@ -261,6 +267,8 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     y = origin.y ;
     window->MacWindowToRootWindow( &x , &y ) ;
     m_macPort = UMAGetWindowPort( windowref ) ;
+    m_ok = true ;
+
 #if wxMAC_USE_CORE_GRAPHICS
     m_macLocalOriginInPort.x = x ;
     m_macLocalOriginInPort.y = y ;
@@ -269,7 +277,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
         m_graphicContext = new wxMacCGContext( (CGContextRef) window->MacGetCGContextRef() ) ;
         m_graphicContext->SetPen( m_pen ) ;
         m_graphicContext->SetBrush( m_brush ) ;
-        m_ok = TRUE ;
         SetClippingRegion( 0 , 0 , size.x , size.y ) ;
         SetBackground(MacGetBackgroundBrush(window));
     }
@@ -277,7 +284,6 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     {
         wxLogDebug(wxT("You cannot create a wxPaintDC outside an OS-draw event") ) ;
         m_graphicContext = NULL ;
-        m_ok = TRUE ;
     }
     // there is no out-of-order drawing on OSX
 #else
@@ -290,8 +296,8 @@ wxPaintDC::wxPaintDC(wxWindow *window)
     OffsetRgn( (RgnHandle) m_macBoundaryClipRgn , m_macLocalOrigin.x , m_macLocalOrigin.y ) ;
     CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
     SetBackground(MacGetBackgroundBrush(window));
-    m_ok = TRUE ;
 #endif
+
     SetFont( window->GetFont() ) ;
 }
 
@@ -305,5 +311,3 @@ void wxPaintDC::DoGetSize(int *width, int *height) const
 
     m_window->GetClientSize( width, height );
 }
-
-