X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3417c2cd3d5cb05451270b5a09fe2355406158a3..1de4baa31f17548b32a376a71ce50fee6a3e759c:/include/wx/layout.h diff --git a/include/wx/layout.h b/include/wx/layout.h index e3e5353ce7..fe232e266a 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -16,11 +16,11 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "layout.h" #endif -#include "wx/defs.h" +#include "wx/object.h" // X stupidly defines these in X.h #ifdef Above @@ -177,8 +177,8 @@ public: bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool AreSatisfied() const { - return left.GetDone() && top.GetDone() && right.GetDone() && - bottom.GetDone() && centreX.GetDone() && centreY.GetDone(); + return left.GetDone() && top.GetDone() && + width.GetDone() && height.GetDone(); } };