Clear --> ClearBackground

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/toplevel.h b/include/wx/mac/toplevel.h
index 8efec137fbaf520cf48fd518c57501dcc57727d9..7fd6551dc15b335c38ecba2655d5ae1e4493efe0 100644 (file)
--- a/include/wx/mac/toplevel.h
+++ b/include/wx/mac/toplevel.h
@@ -75,7 +75,7 @@ public:
                                       const wxString& name ) ;
     static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
     virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;
-    virtual void Clear() ;
+    virtual void ClearBackground() ;
     virtual WXWidget MacGetContainerForEmbedding() ;
     WXWindow MacGetWindowRef() { return m_macWindow ; }
     virtual void MacActivate( long timestamp , bool inIsActivating ) ;

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 8e4a9551c5f90cb7fce2cde8130dacbaabc42cc9..d8f5c9563cf7c1ff13d9af92f4aedc60b21adf67 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -126,7 +126,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     {
         case kEventTextInputUnicodeForKeyEvent :
             // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
-            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the 
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the
             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control )
             {
@@ -341,13 +341,13 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
 
                 GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
                     sizeof( newContentRect ), NULL, &newContentRect );
-                    
+
                 wxRect contentRect(newContentRect.left , newContentRect.top ,
                     newContentRect.right - newContentRect.left ,
                     newContentRect.bottom - newContentRect.top) ;
-                    
+
                 bool handled = false ;
-                if ((attributes & kWindowBoundsChangeSizeChanged) != 0) 
+                if ((attributes & kWindowBoundsChangeSizeChanged) != 0)
                 {
                     wxSizeEvent event(contentRect , toplevelWindow->GetId());
                     event.SetEventObject(toplevelWindow);
@@ -713,9 +713,9 @@ void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR cli
     *rootwin = this ;
 }
 
-void wxTopLevelWindowMac::Clear()
+void wxTopLevelWindowMac::ClearBackground()
 {
-    wxWindow::Clear() ;
+    wxWindow::ClearBackground() ;
 }
 
 WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
@@ -766,7 +766,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
         DisposeRgn( diffRgn );
     if ( visRgn )
         DisposeRgn( visRgn ) ;
-        
+
     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 8e4a9551c5f90cb7fce2cde8130dacbaabc42cc9..d8f5c9563cf7c1ff13d9af92f4aedc60b21adf67 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -126,7 +126,7 @@ static pascal OSStatus TextInputEventHandler( EventHandlerCallRef handler , Even
     {
         case kEventTextInputUnicodeForKeyEvent :
             // this is only called when no default handler has jumped in, eg a wxControl on a floater window does not
-            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the 
+            // get its own kEventTextInputUnicodeForKeyEvent, so we route back the
             wxControl* control = wxDynamicCast( focus , wxControl ) ;
             if ( control )
             {
@@ -341,13 +341,13 @@ static pascal OSStatus WindowEventHandler( EventHandlerCallRef handler , EventRe
 
                 GetEventParameter( event, kEventParamCurrentBounds, typeQDRectangle, NULL,
                     sizeof( newContentRect ), NULL, &newContentRect );
-                    
+
                 wxRect contentRect(newContentRect.left , newContentRect.top ,
                     newContentRect.right - newContentRect.left ,
                     newContentRect.bottom - newContentRect.top) ;
-                    
+
                 bool handled = false ;
-                if ((attributes & kWindowBoundsChangeSizeChanged) != 0) 
+                if ((attributes & kWindowBoundsChangeSizeChanged) != 0)
                 {
                     wxSizeEvent event(contentRect , toplevelWindow->GetId());
                     event.SetEventObject(toplevelWindow);
@@ -713,9 +713,9 @@ void wxTopLevelWindowMac::MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR cli
     *rootwin = this ;
 }
 
-void wxTopLevelWindowMac::Clear()
+void wxTopLevelWindowMac::ClearBackground()
 {
-    wxWindow::Clear() ;
+    wxWindow::ClearBackground() ;
 }
 
 WXWidget wxTopLevelWindowMac::MacGetContainerForEmbedding()
@@ -766,7 +766,7 @@ void wxTopLevelWindowMac::MacUpdate( long timestamp)
         DisposeRgn( diffRgn );
     if ( visRgn )
         DisposeRgn( visRgn ) ;
-        
+
     EndUpdate( (WindowRef)m_macWindow ) ;
     SetEmptyRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
     m_macNeedsErasing = false ;