Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear --> ClearBackground

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-08-13 21:05:39 +00:00
parent 2f00b79f60
commit 5d2e69e8c0
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/mac/toplevel.h
View File

@@ -75,7 +75,7 @@ public:
const wxString& name ) ; const wxString& name ) ;
static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; } static WXWindow MacGetWindowInUpdate() { return s_macWindowInUpdate ; }
virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ; virtual void MacGetPortParams(WXPOINTPTR localOrigin, WXRECTPTR clipRect, WXWindow *window , wxWindowMac** rootwin ) ;
virtual void Clear() ; virtual void ClearBackground() ;
virtual WXWidget MacGetContainerForEmbedding() ; virtual WXWidget MacGetContainerForEmbedding() ;
WXWindow MacGetWindowRef() { return m_macWindow ; } WXWindow MacGetWindowRef() { return m_macWindow ; }
virtual void MacActivate( long timestamp , bool inIsActivating ) ; virtual void MacActivate( long timestamp , bool inIsActivating ) ;

14
src/mac/carbon/toplevel.cpp
View File

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

14
src/mac/toplevel.cpp
View File

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