Applied DnD patch, adding a field for setting a default action.

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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index da8c9f138bdf35f7ec7ca3a87d620ad76218f94a..d9630ecbb9916fa48eb4d3465437582c81a40631 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -107,13 +107,16 @@ wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
 
     if ( win )
     {
-        int x = 0 , y = 0;
-        win->MacWindowToRootWindow( &x,&y ) ;
-        // get area including focus rect
-        CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
-        if ( !EmptyRgn( m_newClip ) )
-            OffsetRgn( m_newClip , x , y ) ;
-
+        // guard against half constructed objects, this just leads to a empty clip
+        if( win->GetPeer() )
+        {
+            int x = 0 , y = 0;
+            win->MacWindowToRootWindow( &x,&y ) ;
+            // get area including focus rect
+            CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ;
+            if ( !EmptyRgn( m_newClip ) )
+                OffsetRgn( m_newClip , x , y ) ;
+        }
         SetClip( m_newClip ) ;
     }
 }