X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/146ba0feacf1222ec8a45dfd69dae77b063bf2cf..31988931ca21eb21a493db848dc948433599389c:/include/wx/window.h

diff --git a/include/wx/window.h b/include/wx/window.h
index ea39b0fd94..59a9769b1b 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WINDOW_H_BASE_
 #define _WX_WINDOW_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "windowbase.h"
 #endif
 
@@ -838,6 +838,10 @@ public:
 #endif // wxUSE_PALETTE
 
 protected:
+#if wxUSE_CONSTRAINTS
+    // satisfy the constraints for the windows but don't set the window sizes
+    void SatisfyConstraints();
+#endif // wxUSE_CONSTRAINTS
 
     // the window id - a number which uniquely identifies a window among
     // its siblings unless it is -1
@@ -850,7 +854,10 @@ protected:
 
     // the minimal allowed size for the window (no minimal size if variable(s)
     // contain(s) -1)
-    int                  m_minWidth, m_minHeight, m_maxWidth, m_maxHeight;
+    int                  m_minWidth,
+                         m_minHeight,
+                         m_maxWidth,
+                         m_maxHeight;
 
     // event handler for this window: usually is just 'this' but may be
     // changed with SetEventHandler()