clean up wxBitmapButton::Create(); override MSWGetStyle() (#4804)

[wxWidgets.git] / include / wx / layout.h

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 388398b9e1a922e39fdebbf1cf50a9ef69639fda..accc8836eb9108d6f77b152ac2ea2de6f7195818 100644 (file)
--- 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
 // 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "layout.h"
-#endif
-

 #include "wx/object.h"
 
 // X stupidly defines these in X.h
 #include "wx/object.h"
 
 // X stupidly defines these in X.h


@@ -30,12 +26,14 @@
     #undef Below
 #endif
 
     #undef Below
 #endif
 

+#if wxUSE_CONSTRAINTS
+

 // ----------------------------------------------------------------------------
 // forward declrations
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // forward declrations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowBase;
-class WXDLLEXPORT wxLayoutConstraints;
+class WXDLLIMPEXP_FWD_CORE wxWindowBase;
+class WXDLLIMPEXP_FWD_CORE wxLayoutConstraints;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -66,14 +64,14 @@ enum wxRelationship
 // wxIndividualLayoutConstraint: a constraint on window position
 // ----------------------------------------------------------------------------
 
 // 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
 
 {
 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);
 
 
     void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
 


@@ -149,13 +147,15 @@ protected:
     int percent;
     wxEdge otherEdge;
     bool done;
     int percent;
     wxEdge otherEdge;
     bool done;

+
+    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)

 };
 
 // ----------------------------------------------------------------------------
 // wxLayoutConstraints: the complete set of constraints for a window
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxLayoutConstraints: the complete set of constraints for a window
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxLayoutConstraints : public wxObject
+class WXDLLIMPEXP_CORE wxLayoutConstraints : public wxObject

 {
 public:
     // Edge constraints
 {
 public:
     // Edge constraints


@@ -174,7 +174,7 @@ public:
 
     // note that default copy ctor and assignment operators are ok
 
 
     // note that default copy ctor and assignment operators are ok
 

-    ~wxLayoutConstraints();
+    virtual ~wxLayoutConstraints(){}

 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
     bool AreSatisfied() const
 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
     bool AreSatisfied() const


@@ -186,5 +186,6 @@ public:
     DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
 };
 
     DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
 };
 

-#endif
-    // _WX_LAYOUTH__
+#endif // wxUSE_CONSTRAINTS
+
+#endif // _WX_LAYOUT_H_