Implemented wxButton::DoGetBestSize for wxMotif. Now normal buttons

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 736c16c9a3dbe6a3a0eb3531aaefe30846a21bc0..8fb28aa42ede694b75ed5862761b7e4794cd90cf 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -68,25 +68,11 @@ enum wxRelationship
 
 class WXDLLEXPORT wxIndividualLayoutConstraint : public wxObject
 {
 
 class WXDLLEXPORT wxIndividualLayoutConstraint : public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
-
-protected:
-    // To be allowed to modify the internal variables
-    friend class wxIndividualLayoutConstraint_Serialize;
-
-    // 'This' window is the parent or sibling of otherWin
-    wxWindowBase *otherWin;
-
-    wxEdge myEdge;
-    wxRelationship relationship;
-    int margin;
-    int value;
-    int percent;
-    wxEdge otherEdge;
-    bool done;
-

 public:
     wxIndividualLayoutConstraint();
 public:
     wxIndividualLayoutConstraint();

+
+    // note that default copy ctor and assignment operators are ok
+

     ~wxIndividualLayoutConstraint();
 
     void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);
     ~wxIndividualLayoutConstraint();
 
     void Set(wxRelationship rel, wxWindowBase *otherW, wxEdge otherE, int val = 0, int marg = wxLAYOUT_DEFAULT_MARGIN);


@@ -149,7 +135,22 @@ public:
     // is not determinable, -1.
     int GetEdge(wxEdge which, wxWindowBase *thisWin, wxWindowBase *other) const;
 
     // is not determinable, -1.
     int GetEdge(wxEdge which, wxWindowBase *thisWin, wxWindowBase *other) const;
 

-    DECLARE_NO_COPY_CLASS(wxIndividualLayoutConstraint)
+protected:
+    // To be allowed to modify the internal variables
+    friend class wxIndividualLayoutConstraint_Serialize;
+
+    // 'This' window is the parent or sibling of otherWin
+    wxWindowBase *otherWin;
+
+    wxEdge myEdge;
+    wxRelationship relationship;
+    int margin;
+    int value;
+    int percent;
+    wxEdge otherEdge;
+    bool done;
+
+    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -158,8 +159,6 @@ public:
 
 class WXDLLEXPORT wxLayoutConstraints : public wxObject
 {
 
 class WXDLLEXPORT wxLayoutConstraints : public wxObject
 {

-    DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)
-

 public:
     // Edge constraints
     wxIndividualLayoutConstraint left;
 public:
     // Edge constraints
     wxIndividualLayoutConstraint left;


@@ -174,6 +173,9 @@ public:
     wxIndividualLayoutConstraint centreY;
 
     wxLayoutConstraints();
     wxIndividualLayoutConstraint centreY;
 
     wxLayoutConstraints();

+
+    // note that default copy ctor and assignment operators are ok
+

     ~wxLayoutConstraints();
 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
     ~wxLayoutConstraints();
 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);


@@ -182,6 +184,8 @@ public:
         return left.GetDone() && top.GetDone() &&
                width.GetDone() && height.GetDone();
     }
         return left.GetDone() && top.GetDone() &&
                width.GetDone() && height.GetDone();
     }

+
+    DECLARE_DYNAMIC_CLASS(wxLayoutConstraints)

 };
 
 #endif
 };
 
 #endif