X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..4e2251ecd324ba89c486434485efcb1d32ee7dca:/include/wx/layout.h diff --git a/include/wx/layout.h b/include/wx/layout.h index c46241c1d8..62655782b8 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: layout.h -// Purpose: Layout classes +// Name: wx/layout.h +// Purpose: OBSOLETE layout constraint classes, use sizers instead // Author: Julian Smart // Modified by: // Created: 29/01/98 @@ -9,17 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_LAYOUTH__ -#define _WX_LAYOUTH__ +#ifndef _WX_LAYOUT_H_ +#define _WX_LAYOUT_H_ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "layout.h" -#endif - #include "wx/object.h" // X stupidly defines these in X.h @@ -30,6 +26,8 @@ #undef Below #endif +#if wxUSE_CONSTRAINTS + // ---------------------------------------------------------------------------- // forward declrations // ---------------------------------------------------------------------------- @@ -73,7 +71,7 @@ public: // note that default copy ctor and assignment operators are ok - ~wxIndividualLayoutConstraint(); + virtual ~wxIndividualLayoutConstraint(){} void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN); @@ -176,7 +174,7 @@ public: // note that default copy ctor and assignment operators are ok - ~wxLayoutConstraints(); + virtual ~wxLayoutConstraints(){} bool SatisfyConstraints(wxWindowBase *win, int *noChanges); bool AreSatisfied() const @@ -188,5 +186,6 @@ public: DECLARE_DYNAMIC_CLASS(wxLayoutConstraints) }; -#endif - // _WX_LAYOUTH__ +#endif // wxUSE_CONSTRAINTS + +#endif // _WX_LAYOUT_H_