Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 388398b9e1a922e39fdebbf1cf50a9ef69639fda..d6ffed803e6352169ea6494ee996e798c2d4b90d 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LAYOUTH__
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "layout.h"
 #endif
 
@@ -73,7 +73,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 +149,8 @@ protected:
     int percent;
     wxEdge otherEdge;
     bool done;
+
+    DECLARE_DYNAMIC_CLASS(wxIndividualLayoutConstraint)
 };
 
 // ----------------------------------------------------------------------------
@@ -174,7 +176,7 @@ public:
 
     // note that default copy ctor and assignment operators are ok
 
-    ~wxLayoutConstraints();
+    ~wxLayoutConstraints(){}
 
     bool SatisfyConstraints(wxWindowBase *win, int *noChanges);
     bool AreSatisfied() const