X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34dc8f910f88dc39a2f5fd9c3d894d797212a074..0888ccc71f062fcf31845a04cce3cf1dfe799e05:/src/mac/carbon/toplevel.cpp

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index b29a256276..8c84e811e0 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -40,6 +40,7 @@
 #include "wx/mac/uma.h"
 #include "wx/mac/aga.h"
 #include "wx/tooltip.h"
+#include "wx/dnd.h"
 
 #define wxMAC_DEBUG_REDRAW 0
 #ifndef wxMAC_DEBUG_REDRAW
@@ -279,18 +280,6 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     m_macFocus = NULL ;
 }
 
-void wxTopLevelWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) 
-{
-    localOrigin->h = 0;
-    localOrigin->v = 0;
-    clipRect->left = 0;
-    clipRect->top = 0;
-    clipRect->right = m_width ;//width;
-    clipRect->bottom = m_height ;// height;
-    *window = m_macWindow ;
-    *rootwin = this ;
-}
-
 void wxTopLevelWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window  , wxWindowMac** rootwin) 
 {
     localOrigin->h = 0;
@@ -305,13 +294,7 @@ void wxTopLevelWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, W
 
 void wxTopLevelWindowMac::Clear()
 {
-    wxMacDrawingClientHelper helper ( this ) ;
-    int w ,h ;
-    wxPoint origin = GetClientAreaOrigin() ;
-    GetClientSize( &w , &h ) ;
-    ::SetThemeWindowBackground( m_macWindow , m_macWindowBackgroundTheme , false ) ;
-    Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ;
-    EraseRect( &r ) ;
+  wxWindow::Clear() ;
 }
 
 ControlHandle wxTopLevelWindowMac::MacGetContainerForEmbedding() 
@@ -327,7 +310,6 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
     #else
     AGAPortHelper help( (m_macWindow) ) ;
     #endif
-    SetOrigin( 0 , 0 ) ;
     BeginUpdate( m_macWindow ) ;
 
     RgnHandle       updateRgn = NewRgn();    
@@ -699,3 +681,4 @@ void wxTopLevelWindowMac::MacInvalidate( const Rect * rect, bool eraseBackground
 #endif
   SetPort( formerPort ) ;
 }
+