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

General tidy-up (mainly typecasts) to allow the use of the SGI native

Browse Source 
compilers (tested on Irix 6.5 with -mips3 -n32).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (RO)
1998-08-23 03:22:56 +00:00
parent cb6780ff01
commit c67daf8777
215 changed files with 1654 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/layout.cpp
View File

@@ -92,7 +92,7 @@ int wxSizerMarginY(wxWindow *win)
wxIndividualLayoutConstraint::wxIndividualLayoutConstraint()
{
myEdge = wxTop; relationship = wxUnconstrained; margin = 0; value = 0; percent = 0; otherEdge = wxTop;
done = FALSE; otherWin = NULL;
done = FALSE; otherWin = (wxWindow *) NULL;
}
wxIndividualLayoutConstraint::~wxIndividualLayoutConstraint()
@@ -140,7 +140,7 @@ bool wxIndividualLayoutConstraint::ResetIfWin(wxWindow *otherW)
if (otherW == otherWin)
{
myEdge = wxTop; relationship = wxAsIs; margin = 0; value = 0; percent = 0; otherEdge = wxTop;
otherWin = NULL;
otherWin = (wxWindow *) NULL;
return TRUE;
}
else
@@ -1211,7 +1211,7 @@ wxSizer::~wxSizer()
if (!win->IsKindOf(CLASSINFO(wxSizer)))
{
delete node;
win->SetSizerParent(NULL);
win->SetSizerParent((wxWindow *) NULL);
}
else
{
@@ -1223,8 +1223,8 @@ wxSizer::~wxSizer()
if (m_sizerParent) // && !m_sizerParent->IsKindOf(CLASSINFO(wxSizer)))
{
m_sizerParent->SetSizer(NULL);
m_sizerParent = NULL;
m_sizerParent->SetSizer((wxSizer *) NULL);
m_sizerParent = (wxWindow *) NULL;
}
}