From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 29 Mar 2009 20:51:40 +0000 (+0000)
Subject: special casing mac code
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d7928233956f3c56fd402e0e496f7da238510b61

special casing mac code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 31bac26e06..44fc178369 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -474,7 +474,7 @@ void wxWindowBase::FitInside()
 }
 
 // On Mac, scrollbars are explicitly children.
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
 static bool wxHasRealChildren(const wxWindowBase* win)
 {
     int realChildCount = 0;
@@ -550,7 +550,7 @@ wxSize wxWindowBase::DoGetBestSize() const
     }
 #endif // wxUSE_CONSTRAINTS
     else if ( !GetChildren().empty()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__)
               && wxHasRealChildren(this)
 #endif
               )