X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c469f7f4e85bd5212bf0409be0384a7b89405df..481fcc780da6b3ddbee3bd9f1eca5aafeef0a58b:/src/mac/toplevel.cpp diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 14afc2d959..b952c7cea2 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -41,6 +41,11 @@ #include "wx/mac/aga.h" #include "wx/tooltip.h" +#define wxMAC_DEBUG_REDRAW 0 +#ifndef wxMAC_DEBUG_REDRAW +#define wxMAC_DEBUG_REDRAW 0 +#endif + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -274,18 +279,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; @@ -300,13 +293,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() @@ -322,7 +309,6 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp) #else AGAPortHelper help( (m_macWindow) ) ; #endif - SetOrigin( 0 , 0 ) ; BeginUpdate( m_macWindow ) ; RgnHandle updateRgn = NewRgn(); @@ -689,7 +675,7 @@ void wxTopLevelWindowMac::MacInvalidate( const Rect * rect, bool eraseBackground } InvalWindowRect( m_macWindow , rect ) ; // turn this on to debug the refreshing cycle -#if 0 +#if wxMAC_DEBUG_REDRAW PaintRect( rect ) ; #endif SetPort( formerPort ) ;