document the main event table macros, wxEventType, wxNewEventType; create a new group...

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

diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h
index 660df2f9add5b992e3c9ca1b5bfe6109e89b8773..00b252905edcc3e341ebb773b12f2a711064f13c 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.
@@ -401,12 +401,12 @@ public:
 
         This method replaces the previously set alignment with the specified one.
 
-        @param align
+        @param alignment
             Combination of @c wxALIGN_XXX bit masks.
 
         @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).
@@ -526,43 +526,6 @@ public:
 
 
 
-/**
-    @class wxNotebookSizer
-
-    @deprecated
-    This class is deprecated and should not be used in new code! It is no
-    longer needed, wxNotebook control can be inserted
-    into any sizer class and its minimal size will be determined correctly.
-
-    wxNotebookSizer is a specialized sizer to make sizers work in connection
-    with using notebooks. This sizer is different from any other sizer as you
-    must not add any children to it - instead, it queries the notebook class
-    itself.  The only thing this sizer does is to determine the size of the
-    biggest page of the notebook and report an adjusted minimal size to a more
-    toplevel sizer.
-
-    @library{wxbase}
-    @category{winlayout}
-
-    @see wxSizer, wxNotebook,
-         @ref overview_sizer "Sizers overview"
-*/
-class wxNotebookSizer : public wxSizer
-{
-public:
-    /**
-        Constructor. It takes an associated notebook as its only parameter.
-    */
-    wxNotebookSizer(wxNotebook* notebook);
-
-    /**
-        Returns the notebook associated with the sizer.
-    */
-    wxNotebook* GetNotebook();
-};
-
-
-
 /**
     @class wxFlexGridSizer
 
@@ -655,7 +618,7 @@ public:
 
         @see SetFlexibleDirection(), SetNonFlexibleGrowMode()
     */
-    int GetNonFlexibleGrowMode() const;
+    wxFlexSizerGrowMode GetNonFlexibleGrowMode() const;
 
     /**
         Returns @true if column @a idx is growable.
@@ -1011,7 +974,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.
@@ -1079,7 +1042,7 @@ public:
 
         @see Remove()
     */
-    bool Detach(size_t index);
+    virtual bool Detach(int index);
 
     /**
         Tell the sizer to resize the @a window so that its client area matches the
@@ -1355,7 +1318,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
@@ -1374,7 +1337,7 @@ public:
 
         @return @true if the child item was found and removed, @false otherwise.
     */
-    bool Remove(wxWindow* window);
+    virtual bool Remove(wxWindow* window);
 
     /**
         Removes a sizer child from the sizer and destroys it.
@@ -1403,7 +1366,7 @@ public:
 
         @return @true if the child item was found and removed, @false otherwise.
     */
-    bool Remove(size_t index);
+    virtual bool Remove(int index);
 
     /**
         Detaches the given @a oldwin from the sizer and replaces it with the
@@ -1418,8 +1381,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 +1396,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
@@ -1473,7 +1436,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(wxWindow* window, int width, int height);
+    bool SetItemMinSize(wxWindow* window, int width, int height);
 
     /**
         Set an item's minimum size by window, sizer, or position.
@@ -1484,7 +1447,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(wxSizer* sizer, int width, int height);
+    bool SetItemMinSize(wxSizer* sizer, int width, int height);
 
     /**
         Set an item's minimum size by window, sizer, or position.
@@ -1495,7 +1458,7 @@ public:
 
         @see wxSizerItem::SetMinSize()
     */
-    void SetItemMinSize(size_t index, int width, int height);
+    bool SetItemMinSize(size_t index, int width, int height);
 
     /**
         Call this to give the sizer a minimal size.
@@ -1678,7 +1641,7 @@ public:
     /**
         This constructor creates a new static box with the given label and parent window.
     */
-    wxStaticBoxSizer(int orient, wxWindow parent,
+    wxStaticBoxSizer(int orient, wxWindow *parent,
                      const wxString& label = wxEmptyString);
 
     /**