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

removed superfluous casts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2003-04-19 08:15:44 +00:00
parent 90771fe589
commit 9bd1404d20
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/window.cpp
View File

@@ -827,7 +827,7 @@ void wxWindowMac::MacSuperShown( bool show )
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
if ( child->m_isShown ) if ( child->m_isShown )
child->MacSuperShown( show ) ; child->MacSuperShown( show ) ;
node = node->GetNext(); node = node->GetNext();
@@ -1278,7 +1278,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue; if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue; if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue; if (child->IsTopLevel()) continue;
@@ -1474,7 +1474,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
// added the m_isShown test --dmazzoni // added the m_isShown test --dmazzoni
if ( child->MacGetRootWindow() == window && child->m_isShown ) if ( child->MacGetRootWindow() == window && child->m_isShown )
{ {
@@ -1579,7 +1579,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() ) if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
{ {
if (child->MacDispatchMouseEvent(event)) if (child->MacDispatchMouseEvent(event))
@@ -1717,7 +1717,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if ( !child->IsTopLevel() && child->IsShown() ) if ( !child->IsTopLevel() && child->IsShown() )
{ {
@@ -1740,7 +1740,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *sibling = (wxWindowMac*)node->GetData(); wxWindowMac *sibling = node->GetData();
if ( sibling == this ) if ( sibling == this )
{ {
thisWindowThrough = true ; thisWindowThrough = true ;
@@ -1829,7 +1829,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
{ {
// calculate the update region for the child windows by intersecting the window rectangle with our own // calculate the update region for the child windows by intersecting the window rectangle with our own
// passed in update region and then offset it to be client-wise window coordinates again // passed in update region and then offset it to be client-wise window coordinates again
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
SectRgn( childupdate , updatergn , childupdate ) ; SectRgn( childupdate , updatergn , childupdate ) ;
OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
@@ -1989,7 +1989,7 @@ void wxWindowMac::MacSuperChangedPosition()
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
child->MacSuperChangedPosition() ; child->MacSuperChangedPosition() ;
node = node->GetNext(); node = node->GetNext();
} }
@@ -2002,7 +2002,7 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
child->MacTopLevelWindowChangedPosition() ; child->MacTopLevelWindowChangedPosition() ;
node = node->GetNext(); node = node->GetNext();
} }

18
src/mac/window.cpp
View File

@@ -827,7 +827,7 @@ void wxWindowMac::MacSuperShown( bool show )
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
if ( child->m_isShown ) if ( child->m_isShown )
child->MacSuperShown( show ) ; child->MacSuperShown( show ) ;
node = node->GetNext(); node = node->GetNext();
@@ -1278,7 +1278,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue; if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue; if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue; if (child->IsTopLevel()) continue;
@@ -1474,7 +1474,7 @@ bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac**
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
// added the m_isShown test --dmazzoni // added the m_isShown test --dmazzoni
if ( child->MacGetRootWindow() == window && child->m_isShown ) if ( child->MacGetRootWindow() == window && child->m_isShown )
{ {
@@ -1579,7 +1579,7 @@ bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() ) if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
{ {
if (child->MacDispatchMouseEvent(event)) if (child->MacDispatchMouseEvent(event))
@@ -1717,7 +1717,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
{ {
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
if ( !child->IsTopLevel() && child->IsShown() ) if ( !child->IsTopLevel() && child->IsShown() )
{ {
@@ -1740,7 +1740,7 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSibling
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
{ {
wxWindowMac *sibling = (wxWindowMac*)node->GetData(); wxWindowMac *sibling = node->GetData();
if ( sibling == this ) if ( sibling == this )
{ {
thisWindowThrough = true ; thisWindowThrough = true ;
@@ -1829,7 +1829,7 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
{ {
// calculate the update region for the child windows by intersecting the window rectangle with our own // calculate the update region for the child windows by intersecting the window rectangle with our own
// passed in update region and then offset it to be client-wise window coordinates again // passed in update region and then offset it to be client-wise window coordinates again
wxWindowMac *child = (wxWindowMac*)node->GetData(); wxWindowMac *child = node->GetData();
SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
SectRgn( childupdate , updatergn , childupdate ) ; SectRgn( childupdate , updatergn , childupdate ) ;
OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
@@ -1989,7 +1989,7 @@ void wxWindowMac::MacSuperChangedPosition()
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
child->MacSuperChangedPosition() ; child->MacSuperChangedPosition() ;
node = node->GetNext(); node = node->GetNext();
} }
@@ -2002,7 +2002,7 @@ void wxWindowMac::MacTopLevelWindowChangedPosition()
wxWindowListNode *node = GetChildren().GetFirst(); wxWindowListNode *node = GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindowMac *child = (wxWindowMac *)node->GetData(); wxWindowMac *child = node->GetData();
child->MacTopLevelWindowChangedPosition() ; child->MacTopLevelWindowChangedPosition() ;
node = node->GetNext(); node = node->GetNext();
} }