Deprecated wxSizer::Remove( wxWindow* ), s/Remove/Detach/ in most places.
Made wxSizer child list typesafe. I've not added the wxList implicit conversion kludge yet, let's see who complains first perhaps.. Deprecated wxSizer::{G,S}etOption in favour of {G,S}etProportion in line with the parameter name change in the docs. Added {G,S}etSpacer consistent with the accessors for windows/sizers. Made all wxSizer index parameters size_t -- we support no sensible interpretation for negative indexes in them. Hopefully this will cause no real problems, but code doing (eg. Remove( 0 )) will need to change to use 0u to resolve the ambiguity with overloaded members. This is probably a Good Thing though, ymmv. s/FALSE/false/g ; s/TRUE/true/g ; s/wxASSERT/wxASSERT_MSG/g in sizer.{cpp,h} Fixed (I hope) the brokenness in wxSizer::Show -- I have no code to test this yet, so it's a blind change, but spacers should now be hidden correctly instead of ignored, and it should be properly reversable over multiple calls now too. removed pointless private scoping around DECLARE_CLASS macros. Replace 0's I added previously with NULL -- not like that will end the email thread either.. Added Add( wxSizerItem * ) & co. There are probably a couple of other places we can usefully do something like this too. Stopped short of refactoring everything to raise some issues about sizer method recursion on -dev. Updated wxSizer docs some more, they are still incomplete but getting better. wrapped KeyCode in wxDEPRECATED, converted all (gtk build) instances to GetKeyCode. There may be a few left for other ports. Fixed a couple of other random compile warnings along the way. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -379,11 +379,11 @@ void MMBoardFrame::CloseVideoWindow()
|
||||
{
|
||||
if (!m_video_window)
|
||||
return;
|
||||
|
||||
m_sizer->Remove(m_video_window);
|
||||
|
||||
m_sizer->Detach( m_video_window );
|
||||
delete m_video_window;
|
||||
m_video_window = NULL;
|
||||
|
||||
|
||||
m_sizer->Fit(this);
|
||||
}
|
||||
|
||||
|
@@ -172,8 +172,8 @@ void cbGCUpdatesMgr::UpdateNow()
|
||||
// number of bars, that were changed in the current row
|
||||
int nBars = 0;
|
||||
|
||||
wxRect r1 = pRow->mUMgrData.mPrevBounds;
|
||||
wxRect r2 = pRow->mBoundsInParent;
|
||||
//wxRect r1 = pRow->mUMgrData.mPrevBounds;
|
||||
//wxRect r2 = pRow->mBoundsInParent;
|
||||
|
||||
if ( WasChanged( pRow->mUMgrData, pRow->mBoundsInParent ) )
|
||||
|
||||
|
@@ -296,11 +296,10 @@ void wxMultiCellSizer::RecalcSizes()
|
||||
wxPoint c_point;
|
||||
wxSize c_size;
|
||||
|
||||
wxNode *current;
|
||||
current = m_children.GetFirst();
|
||||
wxSizerItemList::Node *current = m_children.GetFirst();
|
||||
while (current != NULL)
|
||||
{
|
||||
wxSizerItem *item = (wxSizerItem*) current->Data();
|
||||
wxSizerItem *item = current->GetData();
|
||||
|
||||
wxMultiCellItemHandle *rect;
|
||||
if (item != NULL &&
|
||||
@@ -372,7 +371,7 @@ void wxMultiCellSizer::RecalcSizes()
|
||||
}
|
||||
item->SetDimension(c_point, c_size);
|
||||
}
|
||||
current = current->Next();
|
||||
current = current->GetNext();
|
||||
}
|
||||
}
|
||||
//---------------------------------------------------------------------------
|
||||
@@ -404,10 +403,10 @@ void wxMultiCellSizer :: GetMinimums()
|
||||
m_weights[x]->SetWidth(0);
|
||||
}
|
||||
|
||||
wxNode *node = m_children.GetFirst();
|
||||
wxSizerItemList::Node *node = m_children.GetFirst();
|
||||
while (node)
|
||||
{
|
||||
wxSizerItem *item = (wxSizerItem*) node->Data();
|
||||
wxSizerItem *item = node->GetData();
|
||||
wxMultiCellItemHandle *rect;
|
||||
if (item != NULL &&
|
||||
(rect = (wxMultiCellItemHandle *)item->GetUserData()) != NULL)
|
||||
@@ -506,7 +505,7 @@ void wxMultiCellSizer :: GetMinimums()
|
||||
m_maxWidth[col] = wxMax(m_maxWidth[col], m_defaultCellSize.GetWidth());
|
||||
m_weights[col]->SetWidth(wxMax(m_weights[col]->GetWidth(), rect->GetWeight().GetWidth()));
|
||||
}
|
||||
node = node->Next();
|
||||
node = node->GetNext();
|
||||
}
|
||||
}
|
||||
} // wxMultiCellSizer :: GetMinimums
|
||||
|
Reference in New Issue
Block a user