Return old, not new, selection from wxMSW wxNotebook::ChangeSelection().

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 289b765d80f2beeb7ac9eff95f4b9af1a9a4571e..ac8f5b6f34fe3bec689503be5ff11b7ea645cd06 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -510,7 +510,7 @@ public:
     wxSizerItem* Add( int width, int height, const wxSizerFlags& flags);
     wxSizerItem* Add( wxSizerItem *item);
 
-    wxSizerItem* AddSpacer(int size);
+    virtual wxSizerItem *AddSpacer(int size);
     wxSizerItem* AddStretchSpacer(int prop = 1);
 
     wxSizerItem* Insert(size_t index,
@@ -735,6 +735,11 @@ public:
 
     virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
 
+#ifdef __WXOSX__
+    // TODO change to better condition
+    using wxSizer::Insert;
+#endif
+
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 
@@ -913,6 +918,8 @@ public:
                       wxT("invalid value for wxBoxSizer orientation") );
     }
 
+    virtual wxSizerItem *AddSpacer(int size);
+
     int GetOrientation() const { return m_orient; }
 
     bool IsVertical() const { return m_orient == wxVERTICAL; }