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

don't overload SizeInM{aj,in}orDir() on const/non-const, VC6 has troubles with this as does DMC, so use different names

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-11 12:42:58 +00:00
parent 867b485eb6
commit 3d2085a422
2 changed files with 136 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/sizer.h
View File

@@ -814,7 +814,7 @@ public:
protected: protected:
// helpers for our code: this returns the component of the given wxSize in // helpers for our code: this returns the component of the given wxSize in
// the direction of the sizer and in the other direction, respectively // the direction of the sizer and in the other direction, respectively
int SizeInMajorDir(const wxSize& sz) const int GetSizeInMajorDir(const wxSize& sz) const
{ {
return m_orient == wxHORIZONTAL ? sz.x : sz.y; return m_orient == wxHORIZONTAL ? sz.x : sz.y;
} }
@@ -829,7 +829,7 @@ protected:
return m_orient == wxHORIZONTAL ? pt.x : pt.y; return m_orient == wxHORIZONTAL ? pt.x : pt.y;
} }
int SizeInMinorDir(const wxSize& sz) const int GetSizeInMinorDir(const wxSize& sz) const
{ {
return m_orient == wxHORIZONTAL ? sz.y : sz.x; return m_orient == wxHORIZONTAL ? sz.y : sz.x;
} }

161
src/common/sizer.cpp
View File

@@ -274,25 +274,25 @@ wxSize wxSizerItem::GetSize() const
bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOtherDir) bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOtherDir)
{ {
// The size that come here will be including borders. Child items should get it // The size that come here will be including borders. Child items should get it
// without borders. // without borders.
if( size>0 ) if( size>0 )
{ {
if( direction==wxHORIZONTAL ) if( direction==wxHORIZONTAL )
{ {
if (m_flag & wxWEST) if (m_flag & wxWEST)
size -= m_border; size -= m_border;
if (m_flag & wxEAST) if (m_flag & wxEAST)
size -= m_border; size -= m_border;
} }
else if( direction==wxVERTICAL ) else if( direction==wxVERTICAL )
{ {
if (m_flag & wxNORTH) if (m_flag & wxNORTH)
size -= m_border; size -= m_border;
if (m_flag & wxSOUTH) if (m_flag & wxSOUTH)
size -= m_border; size -= m_border;
} }
} }
bool didUse = false; bool didUse = false;
// Pass the information along to the held object // Pass the information along to the held object
@@ -300,7 +300,7 @@ bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOth
{ {
didUse = GetSizer()->InformFirstDirection(direction,size,availableOtherDir); didUse = GetSizer()->InformFirstDirection(direction,size,availableOtherDir);
if (didUse) if (didUse)
m_minSize = GetSizer()->CalcMin(); m_minSize = GetSizer()->CalcMin();
} }
else if (IsWindow()) else if (IsWindow())
{ {
@@ -308,32 +308,32 @@ bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOth
if (didUse) if (didUse)
m_minSize = m_window->GetEffectiveMinSize(); m_minSize = m_window->GetEffectiveMinSize();
// This information is useful for items with wxSHAPED flag, since // This information is useful for items with wxSHAPED flag, since
// we can request an optimal min size for such an item. Even if // we can request an optimal min size for such an item. Even if
// we overwrite the m_minSize member here, we can read it back from // we overwrite the m_minSize member here, we can read it back from
// the owned window (happens automatically). // the owned window (happens automatically).
if( (m_flag & wxSHAPED) && (m_flag & wxEXPAND) && direction ) if( (m_flag & wxSHAPED) && (m_flag & wxEXPAND) && direction )
{ {
if( !wxIsNullDouble(m_ratio) ) if( !wxIsNullDouble(m_ratio) )
{ {
wxCHECK_MSG( (m_proportion==0), false, _T("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") ); wxCHECK_MSG( (m_proportion==0), false, _T("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") );
if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) ) if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) )
{ {
// Clip size so that we don't take too much // Clip size so that we don't take too much
if( availableOtherDir>=0 && int(size/m_ratio)-m_minSize.y>availableOtherDir ) if( availableOtherDir>=0 && int(size/m_ratio)-m_minSize.y>availableOtherDir )
size = int((availableOtherDir+m_minSize.y)*m_ratio); size = int((availableOtherDir+m_minSize.y)*m_ratio);
m_minSize = wxSize(size,int(size/m_ratio)); m_minSize = wxSize(size,int(size/m_ratio));
} }
else if( direction==wxVERTICAL ) else if( direction==wxVERTICAL )
{ {
// Clip size so that we don't take too much // Clip size so that we don't take too much
if( availableOtherDir>=0 && int(size*m_ratio)-m_minSize.x>availableOtherDir ) if( availableOtherDir>=0 && int(size*m_ratio)-m_minSize.x>availableOtherDir )
size = int((availableOtherDir+m_minSize.x)/m_ratio); size = int((availableOtherDir+m_minSize.x)/m_ratio);
m_minSize = wxSize(int(size*m_ratio),size); m_minSize = wxSize(int(size*m_ratio),size);
} }
didUse = true; didUse = true;
} }
} }
} }
return didUse; return didUse;
@@ -1848,11 +1848,11 @@ void wxBoxSizer::RecalcSizes()
if ( m_children.empty() ) if ( m_children.empty() )
return; return;
const wxCoord totalMinorSize = SizeInMinorDir(m_size); const wxCoord totalMinorSize = GetSizeInMinorDir(m_size);
// the amount of free space which we should redistribute among the // the amount of free space which we should redistribute among the
// stretchable items (i.e. those with non zero proportion) // stretchable items (i.e. those with non zero proportion)
int delta = SizeInMajorDir(m_size) - SizeInMajorDir(m_minSize); int delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize);
// Inform child items about the size in minor direction, that can // Inform child items about the size in minor direction, that can
@@ -1871,21 +1871,21 @@ void wxBoxSizer::RecalcSizes()
wxSize szMinPrev = item->GetMinSizeWithBorder(); wxSize szMinPrev = item->GetMinSizeWithBorder();
item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta); item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta);
wxSize szMin = item->GetMinSizeWithBorder(); wxSize szMin = item->GetMinSizeWithBorder();
int deltaChange = SizeInMajorDir(szMin-szMinPrev); int deltaChange = GetSizeInMajorDir(szMin-szMinPrev);
if( deltaChange ) if( deltaChange )
{ {
// Since we passed available space along to the item, it should not // Since we passed available space along to the item, it should not
// take too much ,so delat should not become negative. // take too much, so delta should not become negative.
delta -= deltaChange; delta -= deltaChange;
} }
majorMinSum += SizeInMajorDir(item->GetMinSizeWithBorder()); majorMinSum += GetSizeInMajorDir(item->GetMinSizeWithBorder());
} }
// And update our min size // And update our min size
SizeInMajorDir(m_minSize) = majorMinSum; SizeInMajorDir(m_minSize) = majorMinSum;
// might have a new delta now // might have a new delta now
delta = SizeInMajorDir(m_size) - SizeInMajorDir(m_minSize); delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize);
// the position at which we put the next child // the position at which we put the next child
wxPoint pt(m_position); wxPoint pt(m_position);
@@ -1900,16 +1900,10 @@ void wxBoxSizer::RecalcSizes()
if ( !item->IsShown() ) if ( !item->IsShown() )
continue; continue;
#ifndef __DMC__ const wxSize sizeThis(item->GetMinSizeWithBorder());
// DMC doesn't distinguish between
// int SizeInMajorDir(const wxSize& sz) const
// and int& SizeInMajorDir(wxSize& sz)
const
#endif
wxSize sizeThis(item->GetMinSizeWithBorder());
// adjust the size in the major direction using the proportion // adjust the size in the major direction using the proportion
wxCoord majorSize = SizeInMajorDir(sizeThis); wxCoord majorSize = GetSizeInMajorDir(sizeThis);
const int propItem = item->GetProportion(); const int propItem = item->GetProportion();
if ( propItem ) if ( propItem )
{ {
@@ -1925,7 +1919,7 @@ void wxBoxSizer::RecalcSizes()
// apply the alignment in the minor direction // apply the alignment in the minor direction
wxPoint posChild(pt); wxPoint posChild(pt);
wxCoord minorSize = SizeInMinorDir(sizeThis); wxCoord minorSize = GetSizeInMinorDir(sizeThis);
const int flag = item->GetFlag(); const int flag = item->GetFlag();
if ( flag & (wxEXPAND | wxSHAPED) ) if ( flag & (wxEXPAND | wxSHAPED) )
{ {
@@ -1975,14 +1969,11 @@ wxSize wxBoxSizer::CalcMin()
if ( !item->IsShown() ) if ( !item->IsShown() )
continue; continue;
#ifndef __DMC__
const // see __DMC__ above
#endif
wxSize sizeMinThis = item->CalcMin();
SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis); const wxSize sizeMinThis = item->CalcMin();
if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) ) SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
SizeInMinorDir(m_minSize) = SizeInMinorDir(sizeMinThis); if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) )
SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis);
m_totalProportion += item->GetProportion(); m_totalProportion += item->GetProportion();
} }
@@ -2034,7 +2025,7 @@ bool wxWrapSizer::InformFirstDirection( int direction, int size, int WXUNUSED(av
{ {
if( !direction ) if( !direction )
{ {
// Better to keep value, then CalcMin will work better // Better to keep value, then CalcMin will work better
//m_prim_size_last = -1; //m_prim_size_last = -1;
return false; return false;
} }
@@ -2074,12 +2065,12 @@ void wxWrapSizer::RecalcSizes()
// We have to access the list directly, since we don't want to // We have to access the list directly, since we don't want to
// destroy the wxSizerItems. // destroy the wxSizerItems.
for( int ix=m_rows.GetChildren().GetCount()-1; ix>=0; ix-- ){ for( int ix=m_rows.GetChildren().GetCount()-1; ix>=0; ix-- ){
wxSizerItem *psi = m_rows.GetItem( (size_t)ix ); wxSizerItem *psi = m_rows.GetItem( (size_t)ix );
// Restore proportion for last item on line (if item has not been deleted) // Restore proportion for last item on line (if item has not been deleted)
wxPropHolder *pph = (wxPropHolder*)psi->GetUserData(); wxPropHolder *pph = (wxPropHolder*)psi->GetUserData();
if( pph && GetChildren().Find(pph->m_item) ) if( pph && GetChildren().Find(pph->m_item) )
pph->m_item->SetProportion(pph->m_propOld); pph->m_item->SetProportion(pph->m_propOld);
wxSizer *psz = psi->GetSizer(); wxSizer *psz = psi->GetSizer();
wxASSERT( psz ); wxASSERT( psz );
@@ -2089,7 +2080,7 @@ void wxWrapSizer::RecalcSizes()
} }
int lineSumMajor = 0; int lineSumMajor = 0;
int majorSize = SizeInMajorDir(m_size); int majorSize = GetSizeInMajorDir(m_size);
// Make sure we have at least one child sizer // Make sure we have at least one child sizer
m_n_line = 1; m_n_line = 1;
@@ -2109,7 +2100,7 @@ void wxWrapSizer::RecalcSizes()
if ( item->IsShown() ) if ( item->IsShown() )
{ {
wxSize minSz = item->GetMinSize(); wxSize minSz = item->GetMinSize();
int minSzMajor = SizeInMajorDir(minSz); int minSzMajor = GetSizeInMajorDir(minSz);
// More space on this line? // More space on this line?
if( !lineSumMajor || lineSumMajor+minSzMajor<=majorSize ) if( !lineSumMajor || lineSumMajor+minSzMajor<=majorSize )
@@ -2126,17 +2117,17 @@ void wxWrapSizer::RecalcSizes()
// If we have extend-last-on-each-line mode, then do so now // If we have extend-last-on-each-line mode, then do so now
// Note: We must store old proportion value then. // Note: We must store old proportion value then.
if( m_flags&wxEXTEND_LAST_ON_EACH_LINE ) if( m_flags&wxEXTEND_LAST_ON_EACH_LINE )
AdjustPropLastItem(psz,itemLast); AdjustPropLastItem(psz,itemLast);
// The sizer where to insert items in // The sizer where to insert items in
psz = m_rows.GetItem(m_n_line++)->GetSizer(); psz = m_rows.GetItem(m_n_line++)->GetSizer();
} }
itemLast = item; itemLast = item;
psz->Add( item ); psz->Add( item );
// If item is a window, it now has a pointer to the child sizer, // If item is a window, it now has a pointer to the child sizer,
// which is wrong. Set it to point to us. // which is wrong. Set it to point to us.
if( item->GetWindow() ) if( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this ); item->GetWindow()->SetContainingSizer( this );
} }
node = node->GetNext(); node = node->GetNext();
} }
@@ -2153,7 +2144,7 @@ void wxWrapSizer::RecalcSizes()
m_rows.SetDimension( m_position.x, m_position.y, m_size.x, m_size.y ); m_rows.SetDimension( m_position.x, m_position.y, m_size.x, m_size.y );
// Remember this to next time (will be overridden by InformFirstDirection if used) // Remember this to next time (will be overridden by InformFirstDirection if used)
m_prim_size_last = SizeInMajorDir(m_size); m_prim_size_last = GetSizeInMajorDir(m_size);
} }
@@ -2181,12 +2172,12 @@ wxSize wxWrapSizer::CalcMin()
if ( item->IsShown() ) if ( item->IsShown() )
{ {
wxSize minSz = item->CalcMin(); wxSize minSz = item->CalcMin();
int szMajor = SizeInMajorDir(minSz); int szMajor = GetSizeInMajorDir(minSz);
int szMinor = SizeInMinorDir(minSz); int szMinor = GetSizeInMinorDir(minSz);
if( szMajor>maxMajor ) maxMajor = szMajor; if( szMajor>maxMajor ) maxMajor = szMajor;
// More space on this line? // More space on this line?
if( m_prim_size_last<0 || !lineSumMajor || if( m_prim_size_last<0 || !lineSumMajor ||
lineSumMajor+szMajor<=m_prim_size_last ) lineSumMajor+szMajor<=m_prim_size_last )
{ {
lineSumMajor += szMajor; lineSumMajor += szMajor;
if( szMinor>lineMaxMinor ) if( szMinor>lineMaxMinor )