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 aa14476d05d175c84ad437b18a3a77155643f38d..ac8f5b6f34fe3bec689503be5ff11b7ea645cd06 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -735,6 +735,11 @@ public:
 
     virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
 
 
     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();
 
     virtual void RecalcSizes();
     virtual wxSize CalcMin();
 


@@ -827,7 +832,7 @@ class WXDLLIMPEXP_CORE wxFlexGridSizer: public wxGridSizer
 public:
     // ctors specifying the number of columns only: number of rows will be
     // deduced automatically depending on the number of sizer elements
 public:
     // ctors specifying the number of columns only: number of rows will be
     // deduced automatically depending on the number of sizer elements

-    wxFlexGridSizer( int cols, int vgap, int hgap = 0);
+    wxFlexGridSizer( int cols, int vgap, int hgap );

     wxFlexGridSizer( int cols, const wxSize& gap = wxSize(0, 0) );
 
     // ctors specifying the number of rows and columns
     wxFlexGridSizer( int cols, const wxSize& gap = wxSize(0, 0) );
 
     // ctors specifying the number of rows and columns