Fix wrong return value in the changes of r73365.

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

diff --git a/interface/wx/wrapsizer.h b/interface/wx/wrapsizer.h
index 9a186de2fce58e6c6eada4564c46f12648d02108..da82f34e1982273cf8f75634dc0288cdaf9eb830 100644 (file)
--- a/interface/wx/wrapsizer.h
+++ b/interface/wx/wrapsizer.h
@@ -3,17 +3,24 @@
 // Purpose:     interface of wxWrapSizer
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxWrapSizer
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// flags for wxWrapSizer
+enum
+{
+    wxEXTEND_LAST_ON_EACH_LINE,
+    wxREMOVE_LEADING_SPACES,
+    wxWRAPSIZER_DEFAULT_FLAGS
+};
+

 /**
     @class wxWrapSizer
 /**
     @class wxWrapSizer

-    @wxheader{wrapsizer.h}

 
     A wrap sizer lays out its items in a single line, like a box sizer -- as long
 
     A wrap sizer lays out its items in a single line, like a box sizer -- as long

-    as there is space available in that direction. Once all available space in
-    the primary direction has been used, a new line is added and items are added
-    there.
+    as there is space available in that direction.
+    Once all available space in the primary direction has been used, a new line
+    is added and items are added there.

 
     So a wrap sizer has a primary orientation for adding items, and adds lines
     as needed in the secondary direction.
 
     So a wrap sizer has a primary orientation for adding items, and adds lines
     as needed in the secondary direction.


@@ -21,33 +28,40 @@
     @library{wxcore}
     @category{winlayout}
 
     @library{wxcore}
     @category{winlayout}
 

-    @see wxBoxSizer, wxSizer, @ref overview_sizeroverview "Sizer overview"
+    @see wxBoxSizer, wxSizer, @ref overview_sizer

 */
 class wxWrapSizer : public wxBoxSizer
 {
 public:
     /**
 */
 class wxWrapSizer : public wxBoxSizer
 {
 public:
     /**

-        Constructor for a wxWrapSizer. @a orient determines the primary direction of
-        the sizer (the most common case being @c wxHORIZONTAL). The flags
-        parameter can be a combination of the values @c
-        wxEXTEND_LAST_ON_EACH_LINE which will cause the last item on each line
-        to use any remaining space on that line and @c wxREMOVE_LEADING_SPACES
-        which removes any spacer elements from the beginning of a row. Both of
-        these flags are on by default.
+        Constructor for a wxWrapSizer.
+
+        @a orient determines the primary direction of the sizer (the most common
+        case being @c wxHORIZONTAL). The flags parameter can be a combination of
+        the values @c wxEXTEND_LAST_ON_EACH_LINE which will cause the last item
+        on each line to use any remaining space on that line and @c wxREMOVE_LEADING_SPACES
+        which removes any spacer elements from the beginning of a row.
+
+        Both of these flags are on by default.

     */
     wxWrapSizer(int orient = wxHORIZONTAL,
     */
     wxWrapSizer(int orient = wxHORIZONTAL,

-                int flags = wxEXTEND_LAST_ON_EACH_LINE |
-                            wxREMOVE_LEADING_SPACES);
+                int flags = wxWRAPSIZER_DEFAULT_FLAGS);

 
     /**
 
     /**

-        Not used by an application. This is the mechanism by which sizers can inform
-        sub-items of the first determined size component. The sub-item can then better
-        determine its size requirements.
+        Not used by an application.
+
+        This is the mechanism by which sizers can inform sub-items of the first
+        determined size component.
+        The sub-item can then better determine its size requirements.
+

         Returns @true if the information was used (and the sub-item min size was
         updated).
     */
         Returns @true if the information was used (and the sub-item min size was
         updated).
     */

-    bool InformFirstDirection(int direction, int size,
-                              int availableOtherDir);
+    virtual bool InformFirstDirection(int direction, int size,
+                                      int availableOtherDir);
+    
+    virtual void RecalcSizes();
+    virtual wxSize CalcMin();

 
 protected:
     /**
 
 protected:
     /**