special casing mac code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-29 20:51:40 +00:00
parent ac50e6949a
commit d792823395

View File

@@ -474,7 +474,7 @@ void wxWindowBase::FitInside()
} }
// On Mac, scrollbars are explicitly children. // On Mac, scrollbars are explicitly children.
#ifdef __WXMAC__ #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
static bool wxHasRealChildren(const wxWindowBase* win) static bool wxHasRealChildren(const wxWindowBase* win)
{ {
int realChildCount = 0; int realChildCount = 0;
@@ -550,7 +550,7 @@ wxSize wxWindowBase::DoGetBestSize() const
} }
#endif // wxUSE_CONSTRAINTS #endif // wxUSE_CONSTRAINTS
else if ( !GetChildren().empty() else if ( !GetChildren().empty()
#ifdef __WXMAC__ #if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
&& wxHasRealChildren(this) && wxHasRealChildren(this)
#endif #endif
) )