added checks for more wxUSE_SVG dependencies: wxUSE_IMAGE and wxUSE_LIBPNG

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

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 2af9f146a81cbb0d08db2ac18d5513c6b1055231..2691f5d0cd2b7154a2dbed00b03f8d0b5bcda64f 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -32,8 +32,8 @@
 // forward declrations
 // ----------------------------------------------------------------------------
 
 // forward declrations
 // ----------------------------------------------------------------------------
 

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

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


@@ -71,7 +71,7 @@ public:
 
     // note that default copy ctor and assignment operators are ok
 
 
     // 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);
 


@@ -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