X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/layout.h?ds=sidebyside diff --git a/include/wx/layout.h b/include/wx/layout.h index 26ca1119ef..accc8836eb 100644 --- a/include/wx/layout.h +++ b/include/wx/layout.h @@ -1,25 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 // RCS-ID: $Id$ // Copyright: (c) 1998 Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_LAYOUTH__ -#define _WX_LAYOUTH__ +#ifndef _WX_LAYOUT_H_ +#define _WX_LAYOUT_H_ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "layout.h" -#endif - #include "wx/object.h" // X stupidly defines these in X.h @@ -30,12 +26,14 @@ #undef Below #endif +#if wxUSE_CONSTRAINTS + // ---------------------------------------------------------------------------- // forward declrations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowBase; -class WXDLLEXPORT wxLayoutConstraints; +class WXDLLIMPEXP_FWD_CORE wxWindowBase; +class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints; // ---------------------------------------------------------------------------- // constants @@ -66,14 +64,14 @@ enum wxRelationship // wxIndividualLayoutConstraint: a constraint on window position // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxIndividualLayoutConstraint : public wxObject +class WXDLLIMPEXP_CORE wxIndividualLayoutConstraint : public wxObject { public: wxIndividualLayoutConstraint(); // 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); @@ -157,7 +155,7 @@ protected: // wxLayoutConstraints: the complete set of constraints for a window // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxLayoutConstraints : public wxObject +class WXDLLIMPEXP_CORE wxLayoutConstraints : public wxObject { public: // Edge constraints @@ -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_