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

(blind) compilation fix for wxUniv

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-04-09 21:06:31 +00:00
parent 0754a4b307
commit 8afef13331
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/wincmn.cpp
View File

@@ -110,7 +110,6 @@ END_EVENT_TABLE()
// the default initialization // the default initialization
wxWindowBase::wxWindowBase() wxWindowBase::wxWindowBase()
: m_bestSize(wxDefaultSize)
{ {
// no window yet, no parent nor children // no window yet, no parent nor children
m_parent = (wxWindow *)NULL; m_parent = (wxWindow *)NULL;
@@ -545,7 +544,7 @@ wxSize wxWindowBase::DoGetBestSize() const
return wxSize(maxX, maxY); return wxSize(maxX, maxY);
} }
#endif // wxUSE_CONSTRAINTS #endif // wxUSE_CONSTRAINTS
else if ( GetChildren().GetCount() > 0 ) else if ( !GetChildren().empty() )
{ {
// our minimal acceptable size is such that all our windows fit inside // our minimal acceptable size is such that all our windows fit inside
int maxX = 0, int maxX = 0,
@@ -592,20 +591,11 @@ wxSize wxWindowBase::DoGetBestSize() const
return wxSize(maxX, maxY); return wxSize(maxX, maxY);
} }
else else // has children
{ {
// Windows which don't implement DoGetBestSize and aren't parents. // for a generic window there is no natural best size - just use the
// This emulates the behavior of a wxSizer without wxADJUST_MINSIZE // current size
return GetSize();
// If you get the following message you should do one of two things
// 1. Do what it says (best)
// 2. m_bestSize = GetSize() at end of Create() (hack)
if(m_bestSize == wxDefaultSize)
{
wxLogDebug(wxT("Class %s (or superclass) should implement DoGetBestSize()"),GetClassInfo()->GetClassName());
wxConstCast(this,wxWindowBase)->m_bestSize = GetSize();
}
return m_bestSize;
} }
} }
@@ -890,7 +880,7 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
void wxWindowBase::InheritAttributes() void wxWindowBase::InheritAttributes()
{ {
const wxWindow * const parent = GetParent(); const wxWindowBase * const parent = GetParent();
if ( !parent ) if ( !parent )
return; return;