X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/59018c74fe46c8964606c1354f91899df27c0d21..62675f1e331549a873edd094c686fae771e862c5:/include/wx/layout.h

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 388398b9e1..2af9f146a8 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:     wxWindows license
+// 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();
+    ~wxIndividualLayoutConstraint(){}
 
     void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
 
@@ -149,6 +147,8 @@ protected:
     int percent;
     wxEdge otherEdge;
     bool done;
+
+    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 };
 
 // ----------------------------------------------------------------------------
@@ -174,7 +174,7 @@ public:
 
     // note that default copy ctor and assignment operators are ok
 
-    ~wxLayoutConstraints();
+    ~wxLayoutConstraints(){}
 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
     bool AreSatisfied() const
@@ -186,5 +186,6 @@ public:
     DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
 };
 
-#endif
-    // _WX_LAYOUTH__
+#endif // wxUSE_CONSTRAINTS
+
+#endif // _WX_LAYOUT_H_