Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
clean with this compiler. Hopefully I did this without breaking other compilers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,7 +196,7 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
|
||||
size.x = rwidth;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// This is what GetPosition() returns. Since we calculate
|
||||
// borders afterwards, GetPosition() will be the left/top
|
||||
// corner of the surrounding border.
|
||||
@@ -376,7 +376,7 @@ void wxSizer::SetSizeHints( wxWindow *window )
|
||||
window->SetSizeHints( size.x, size.y );
|
||||
}
|
||||
|
||||
wxSize wxSizer::GetMaxWindowSize( wxWindow *window )
|
||||
wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
|
||||
{
|
||||
wxSize sizeMax = wxGetDisplaySize();
|
||||
// make the max size a bit smaller than the screen, a window which takes
|
||||
@@ -947,7 +947,7 @@ wxSize wxBoxSizer::CalcMin()
|
||||
wxSizerItem *item = (wxSizerItem*) node->Data();
|
||||
|
||||
m_stretchable += item->GetOption();
|
||||
|
||||
|
||||
wxSize size( item->CalcMin() );
|
||||
|
||||
if (m_orient == wxHORIZONTAL)
|
||||
@@ -969,7 +969,7 @@ wxSize wxBoxSizer::CalcMin()
|
||||
m_fixedWidth = wxMax( m_fixedWidth, size.x );
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
m_fixedWidth += size.x;
|
||||
m_fixedHeight = wxMax( m_fixedHeight, size.y );
|
||||
}
|
||||
@@ -1004,7 +1004,7 @@ static void GetStaticBoxBorders(wxStaticBox *box,
|
||||
else
|
||||
#endif // __WXGTK__
|
||||
*borderTop = 15;
|
||||
|
||||
(void)box;
|
||||
*borderOther = 5;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user