blind fix for yet another VC6 compilation error

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

diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h
index 660df2f9add5b992e3c9ca1b5bfe6109e89b8773..f49915df5cb0950ca0d2a92a1ec25fce25e279aa 100644 (file)
--- a/interface/wx/sizer.h
+++ b/interface/wx/sizer.h
@@ -239,7 +239,7 @@ public:
     /**
         If this item is tracking a spacer, return its size.
     */
-    const wxSize GetSpacer() const;
+    wxSize GetSpacer() const;
 
     /**
         Get the userData item attribute.
@@ -406,7 +406,7 @@ public:
 
         @see Top(), Left(), Right(), Bottom(), Centre()
     */
-    wxSizerFlags& Align(int align = 0);
+    wxSizerFlags& Align(int alignment);
 
     /**
         Sets the wxSizerFlags to have a border of a number of pixels specified
@@ -493,7 +493,7 @@ public:
     /**
         Sets the proportion of this wxSizerFlags to @e proportion
     */
-    wxSizerFlags& Proportion(int proportion = 0);
+    wxSizerFlags& Proportion(int proportion);
 
     /**
         Aligns the object to the right, similar for @c Align(wxALIGN_RIGHT).
@@ -655,7 +655,7 @@ public:
 
         @see SetFlexibleDirection(), SetNonFlexibleGrowMode()
     */
-    int GetNonFlexibleGrowMode() const;
+    wxFlexSizerGrowMode GetNonFlexibleGrowMode() const;
 
     /**
         Returns @true if column @a idx is growable.
@@ -1011,7 +1011,7 @@ public:
         This method is abstract and has to be overwritten by any derived class.
         Here, the sizer will do the actual calculation of its children's minimal sizes.
     */
-    virtual wxSize CalcMin();
+    virtual wxSize CalcMin() = 0;
 
     /**
         Detaches all children from the sizer.
@@ -1355,7 +1355,7 @@ public:
         Here, the sizer will do the actual calculation of its children's
         positions and sizes.
     */
-    virtual void RecalcSizes();
+    virtual void RecalcSizes() = 0;
 
     /**
         Removes a child window from the sizer, but does @b not destroy it
@@ -1418,8 +1418,8 @@ public:
 
         Returns @true if the child item was found and removed, @false otherwise.
     */
-    bool Replace(wxWindow* oldwin, wxWindow* newwin,
-                 bool recursive = false);
+    virtual bool Replace(wxWindow* oldwin, wxWindow* newwin,
+                         bool recursive = false);
 
     /**
         Detaches the given @a oldsz from the sizer and replaces it with the
@@ -1433,8 +1433,8 @@ public:
 
         Returns @true if the child item was found and removed, @false otherwise.
     */
-    bool Replace(wxSizer* oldsz, wxSizer* newsz,
-                 bool recursive = false);
+    virtual bool Replace(wxSizer* oldsz, wxSizer* newsz,
+                         bool recursive = false);
 
     /**
         Detaches the given item at position @a index from the sizer and