CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 374b1559dc2dced184d7fb7492bfdf7cef189805..ea5803beba060ac018b8bc52426a047cca75ec68 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sizer.h
+// Name:        wx/sizer.h

 // Purpose:     provide wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Purpose:     provide wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)


@@ -12,25 +12,27 @@
 #ifndef __WXSIZER_H__
 #define __WXSIZER_H__
 
 #ifndef __WXSIZER_H__
 #define __WXSIZER_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "sizer.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/window.h"
 #include "wx/defs.h"
 
 #include "wx/window.h"

-#include "wx/frame.h"
-#include "wx/dialog.h"
-#include "wx/bookctrl.h"

 
 //---------------------------------------------------------------------------
 // classes
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 // classes
 //---------------------------------------------------------------------------
 

+class WXDLLEXPORT wxButton;
+class WXDLLEXPORT wxBoxSizer;

 class WXDLLEXPORT wxSizerItem;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxSizerItem;
 class WXDLLEXPORT wxSizer;

-class WXDLLEXPORT wxBoxSizer;

 
 

+#ifndef wxUSE_BORDER_BY_DEFAULT
+    #ifdef __SMARTPHONE__
+        // no borders by default on limited size screen
+        #define wxUSE_BORDER_BY_DEFAULT 0
+    #else
+        #define wxUSE_BORDER_BY_DEFAULT 1
+    #endif
+#endif

 
 // ----------------------------------------------------------------------------
 // wxSizerFlags: flags used for an item in the sizer
 
 // ----------------------------------------------------------------------------
 // wxSizerFlags: flags used for an item in the sizer


@@ -58,16 +60,37 @@ public:
 
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {
 
     wxSizerFlags& Align(int alignment) // combination of wxAlignment values
     {

-        m_flags &= wxALL;
+        m_flags &= ~wxALIGN_MASK;

         m_flags |= alignment;
 
         return *this;
     }
 
         m_flags |= alignment;
 
         return *this;
     }
 

+    wxSizerFlags& Expand()
+    {
+        m_flags |= wxEXPAND;
+        return *this;
+    }
+

     // some shortcuts for Align()
     // some shortcuts for Align()

-    wxSizerFlags& Expand() { return Align(wxEXPAND); }
-    wxSizerFlags& Centre() { return Align(wxCENTRE); }
+    wxSizerFlags& Centre() { return Align(wxALIGN_CENTRE); }

     wxSizerFlags& Center() { return Centre(); }
     wxSizerFlags& Center() { return Centre(); }

+    wxSizerFlags& Top() { return Align(wxALIGN_TOP); }
+    wxSizerFlags& Left() { return Align(wxALIGN_LEFT); }
+    wxSizerFlags& Right() { return Align(wxALIGN_RIGHT); }
+    wxSizerFlags& Bottom() { return Align(wxALIGN_BOTTOM); }
+
+    // default border size used by Border() below
+    static int GetDefaultBorder()
+    {
+#if wxUSE_BORDER_BY_DEFAULT
+        // FIXME: default border size shouldn't be hardcoded and at the very
+        //        least they should depend on the current font size
+        return 5;
+#else
+        return 0;
+#endif
+    }

 
 
     wxSizerFlags& Border(int direction, int borderInPixels)
 
 
     wxSizerFlags& Border(int direction, int borderInPixels)


@@ -82,10 +105,70 @@ public:
 
     wxSizerFlags& Border(int direction = wxALL)
     {
 
     wxSizerFlags& Border(int direction = wxALL)
     {

-        // FIXME: default border size shouldn't be hardcoded
-        return Border(direction, 5);
+#if wxUSE_BORDER_BY_DEFAULT
+        return Border(direction, GetDefaultBorder());
+#else
+        // no borders by default on limited size screen
+        wxUnusedVar(direction);
+
+        return *this;
+#endif
+    }
+
+    wxSizerFlags& DoubleBorder(int direction = wxALL)
+    {
+#if wxUSE_BORDER_BY_DEFAULT
+        return Border(direction, 2*GetDefaultBorder());
+#else
+        wxUnusedVar(direction);
+
+        return *this;
+#endif
+    }
+
+    wxSizerFlags& TripleBorder(int direction = wxALL)
+    {
+#if wxUSE_BORDER_BY_DEFAULT
+        return Border(direction, 3*GetDefaultBorder());
+#else
+        wxUnusedVar(direction);
+
+        return *this;
+#endif

     }
 
     }
 

+    wxSizerFlags& HorzBorder()
+    {
+#if wxUSE_BORDER_BY_DEFAULT
+        return Border(wxLEFT | wxRIGHT, GetDefaultBorder());
+#else
+        return *this;
+#endif
+    }
+
+    wxSizerFlags& DoubleHorzBorder()
+    {
+#if wxUSE_BORDER_BY_DEFAULT
+        return Border(wxLEFT | wxRIGHT, 2*GetDefaultBorder());
+#else
+        return *this;
+#endif
+    }
+
+    // setters for the others flags
+    wxSizerFlags& Shaped()
+    {
+        m_flags |= wxSHAPED;
+
+        return *this;
+    }
+
+    wxSizerFlags& FixedMinSize()
+    {
+        m_flags |= wxFIXED_MINSIZE;
+
+        return *this;
+    }

 
     // accessors for wxSizer only
     int GetProportion() const { return m_proportion; }
 
     // accessors for wxSizer only
     int GetProportion() const { return m_proportion; }


@@ -99,29 +182,36 @@ private:
 };
 
 
 };
 
 

-//---------------------------------------------------------------------------
-// wxSizerItem
-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxSizerSpacer: used by wxSizerItem to represent a spacer
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxSizerItem: public wxObject
+class WXDLLEXPORT wxSizerSpacer

 {
 public:
 {
 public:

-    // window with flags
-    wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
-    {
-        Init(flags);
+    wxSizerSpacer(const wxSize& size) : m_size(size), m_isShown(true) { }

 
 

-        m_window = window;
-    }
+    void SetSize(const wxSize& size) { m_size = size; }
+    const wxSize& GetSize() const { return m_size; }

 
 

-    // sizer with flags
-    wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
-    {
-        Init(flags);
+    void Show(bool show) { m_isShown = show; }
+    bool IsShown() const { return m_isShown; }

 
 

-        m_sizer = sizer;
-    }
+private:
+    // the size, in pixel
+    wxSize m_size;

 
 

+    // is the spacer currently shown?
+    bool m_isShown;
+};
+
+// ----------------------------------------------------------------------------
+// wxSizerItem
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxSizerItem : public wxObject
+{
+public:

     // window
     wxSizerItem( wxWindow *window,
                  int proportion,
     // window
     wxSizerItem( wxWindow *window,
                  int proportion,


@@ -129,6 +219,14 @@ public:
                  int border,
                  wxObject* userData );
 
                  int border,
                  wxObject* userData );
 

+    // window with flags
+    wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
+    {
+        Init(flags);
+
+        DoSetWindow(window);
+    }
+

     // subsizer
     wxSizerItem( wxSizer *sizer,
                  int proportion,
     // subsizer
     wxSizerItem( wxSizer *sizer,
                  int proportion,


@@ -136,6 +234,14 @@ public:
                  int border,
                  wxObject* userData );
 
                  int border,
                  wxObject* userData );
 

+    // sizer with flags
+    wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
+    {
+        Init(flags);
+
+        DoSetSizer(sizer);
+    }
+

     // spacer
     wxSizerItem( int width,
                  int height,
     // spacer
     wxSizerItem( int width,
                  int height,


@@ -144,51 +250,63 @@ public:
                  int border,
                  wxObject* userData);
 
                  int border,
                  wxObject* userData);
 

+    // spacer with flags
+    wxSizerItem(int width, int height, const wxSizerFlags& flags)
+    {
+        Init(flags);
+
+        DoSetSpacer(wxSize(width, height));
+    }
+

     wxSizerItem();
     virtual ~wxSizerItem();
 
     virtual void DeleteWindows();
 
     // Enable deleting the SizerItem without destroying the contained sizer.
     wxSizerItem();
     virtual ~wxSizerItem();
 
     virtual void DeleteWindows();
 
     // Enable deleting the SizerItem without destroying the contained sizer.

-    void DetachSizer()
-        { m_sizer = 0; }
+    void DetachSizer() { m_sizer = NULL; }

 
     virtual wxSize GetSize() const;
     virtual wxSize CalcMin();
 
     virtual wxSize GetSize() const;
     virtual wxSize CalcMin();

-    virtual void SetDimension( wxPoint pos, wxSize size );
+    virtual void SetDimension( const wxPoint& pos, const wxSize& size );

 
     wxSize GetMinSize() const
         { return m_minSize; }
     wxSize GetMinSizeWithBorder() const;
 
     void SetMinSize(const wxSize& size)
 
     wxSize GetMinSize() const
         { return m_minSize; }
     wxSize GetMinSizeWithBorder() const;
 
     void SetMinSize(const wxSize& size)

-        {
-            if (IsWindow()) m_window->SetMinSize(size);
-            m_minSize = size;
-        }
+    {
+        if ( IsWindow() )
+            m_window->SetMinSize(size);
+        m_minSize = size;
+    }

     void SetMinSize( int x, int y )
         { SetMinSize(wxSize(x, y)); }
     void SetInitSize( int x, int y )
         { SetMinSize(wxSize(x, y)); }
 
     void SetMinSize( int x, int y )
         { SetMinSize(wxSize(x, y)); }
     void SetInitSize( int x, int y )
         { SetMinSize(wxSize(x, y)); }
 

-    void SetRatio( int width, int height )
-        // if either of dimensions is zero, ratio is assumed to be 1
-        // to avoid "divide by zero" errors
+    // if either of dimensions is zero, ratio is assumed to be 1
+    // to avoid "divide by zero" errors
+    void SetRatio(int width, int height)

         { m_ratio = (width && height) ? ((float) width / (float) height) : 1; }
         { m_ratio = (width && height) ? ((float) width / (float) height) : 1; }

-    void SetRatio( wxSize size )
-        { m_ratio = (size.x && size.y) ? ((float) size.x / (float) size.y) : 1; }
-    void SetRatio( float ratio )
+    void SetRatio(const wxSize& size)
+        { SetRatio(size.x, size.y); }
+    void SetRatio(float ratio)

         { m_ratio = ratio; }
     float GetRatio() const
         { return m_ratio; }
 
         { m_ratio = ratio; }
     float GetRatio() const
         { return m_ratio; }
 

-    bool IsWindow() const;
-    bool IsSizer() const;
-    bool IsSpacer() const;
+    virtual wxRect GetRect() { return m_rect; }
+
+    bool IsWindow() const { return m_kind == Item_Window; }
+    bool IsSizer() const { return m_kind == Item_Sizer; }
+    bool IsSpacer() const { return m_kind == Item_Spacer; }

 
 

+#if WXWIN_COMPATIBILITY_2_6

     // Deprecated in 2.6, use {G,S}etProportion instead.
     wxDEPRECATED( void SetOption( int option ) );
     wxDEPRECATED( int GetOption() const );
     // Deprecated in 2.6, use {G,S}etProportion instead.
     wxDEPRECATED( void SetOption( int option ) );
     wxDEPRECATED( int GetOption() const );

+#endif // WXWIN_COMPATIBILITY_2_6

 
     void SetProportion( int proportion )
         { m_proportion = proportion; }
 
     void SetProportion( int proportion )
         { m_proportion = proportion; }


@@ -204,47 +322,94 @@ public:
         { return m_border; }
 
     wxWindow *GetWindow() const
         { return m_border; }
 
     wxWindow *GetWindow() const

-        { return m_window; }
-    void SetWindow( wxWindow *window )
-        { m_window = window; m_minSize = window->GetSize(); }
+        { return m_kind == Item_Window ? m_window : NULL; }

     wxSizer *GetSizer() const
     wxSizer *GetSizer() const

-        { return m_sizer; }
-    void SetSizer( wxSizer *sizer )
-        { m_sizer = sizer; }
-    const wxSize &GetSpacer() const
-        { return m_size; }
-    void SetSpacer( const wxSize &size )
-        { m_size = size; m_minSize = size; }
+        { return m_kind == Item_Sizer ? m_sizer : NULL; }
+    wxSize GetSpacer() const;

 
 

-    void Show ( bool show );
-    bool IsShown() const
-        { return m_show; }
+    // this function behaves obviously for the windows and spacers but for the
+    // sizers it returns true if any sizer element is shown and only returns
+    // false if all of them are hidden
+    bool IsShown() const;
+    void Show(bool show);

 
 

+    void SetUserData(wxObject* userData)
+        { delete m_userData; m_userData = userData; }

     wxObject* GetUserData() const
         { return m_userData; }
     wxPoint GetPosition() const
         { return m_pos; }
 
     wxObject* GetUserData() const
         { return m_userData; }
     wxPoint GetPosition() const
         { return m_pos; }
 

+    // these functions delete the current contents of the item if it's a sizer
+    // or a spacer but not if it is a window
+    void AssignWindow(wxWindow *window)
+    {
+        Free();
+        DoSetWindow(window);
+    }
+
+    void AssignSizer(wxSizer *sizer)
+    {
+        Free();
+        DoSetSizer(sizer);
+    }
+
+    void AssignSpacer(const wxSize& size)
+    {
+        Free();
+        DoSetSpacer(size);
+    }
+
+    void AssignSpacer(int w, int h) { AssignSpacer(wxSize(w, h)); }
+
+#if WXWIN_COMPATIBILITY_2_8
+    // these functions do not free the old sizer/spacer and so can easily
+    // provoke the memory leaks and so shouldn't be used, use Assign() instead
+    wxDEPRECATED( void SetWindow(wxWindow *window) );
+    wxDEPRECATED( void SetSizer(wxSizer *sizer) );
+    wxDEPRECATED( void SetSpacer(const wxSize& size) );
+    wxDEPRECATED( void SetSpacer(int width, int height) );
+#endif // WXWIN_COMPATIBILITY_2_8
+

 protected:
     // common part of several ctors
 protected:
     // common part of several ctors

-    void Init();
+    void Init() { m_userData = NULL; m_kind = Item_None; }

 
     // common part of ctors taking wxSizerFlags
     void Init(const wxSizerFlags& flags);
 
 
     // common part of ctors taking wxSizerFlags
     void Init(const wxSizerFlags& flags);
 

+    // free current contents
+    void Free();
+
+    // common parts of Set/AssignXXX()
+    void DoSetWindow(wxWindow *window);
+    void DoSetSizer(wxSizer *sizer);
+    void DoSetSpacer(const wxSize& size);
+
+    // discriminated union: depending on m_kind one of the fields is valid
+    enum
+    {
+        Item_None,
+        Item_Window,
+        Item_Sizer,
+        Item_Spacer,
+        Item_Max
+    } m_kind;
+    union
+    {
+        wxWindow      *m_window;
+        wxSizer       *m_sizer;
+        wxSizerSpacer *m_spacer;
+    };

 
 

-    wxWindow    *m_window;
-    wxSizer     *m_sizer;
-    wxSize       m_size;

     wxPoint      m_pos;
     wxSize       m_minSize;
     int          m_proportion;
     int          m_border;
     int          m_flag;
 
     wxPoint      m_pos;
     wxSize       m_minSize;
     int          m_proportion;
     int          m_border;
     int          m_flag;
 

-    // If true, then this item is considered in the layout
-    // calculation.  Otherwise, it is skipped over.
-    bool         m_show;
+    // on screen rectangle of this item (not including borders)
+    wxRect       m_rect;

 
     // Aspect ratio can always be calculated from m_size,
     // but this would cause precision loss when the window
 
     // Aspect ratio can always be calculated from m_size,
     // but this would cause precision loss when the window


@@ -268,91 +433,98 @@ WX_DECLARE_EXPORTED_LIST( wxSizerItem, wxSizerItemList );
 class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:
 class WXDLLEXPORT wxSizer: public wxObject, public wxClientDataContainer
 {
 public:

-    wxSizer();
-    ~wxSizer();
+    wxSizer() { m_containingWindow = NULL; }
+    virtual ~wxSizer();

 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend
     // overloads for each of window/sizer/spacer/wxSizerItem
 
     // methods for adding elements to the sizer: there are Add/Insert/Prepend
     // overloads for each of window/sizer/spacer/wxSizerItem

-    inline void Add( wxWindow *window,
+    wxSizerItem* Add(wxWindow *window,

                      int proportion = 0,
                      int flag = 0,
                      int border = 0,
                      int proportion = 0,
                      int flag = 0,
                      int border = 0,

-                     wxObject* userData = NULL );
-    inline void Add( wxSizer *sizer,
+                     wxObject* userData = NULL);
+    wxSizerItem* Add(wxSizer *sizer,

                      int proportion = 0,
                      int flag = 0,
                      int border = 0,
                      int proportion = 0,
                      int flag = 0,
                      int border = 0,

-                     wxObject* userData = NULL );
-    inline void Add( int width,
+                     wxObject* userData = NULL);
+    wxSizerItem* Add(int width,

                      int height,
                      int proportion = 0,
                      int flag = 0,
                      int border = 0,
                      int height,
                      int proportion = 0,
                      int flag = 0,
                      int border = 0,

-                     wxObject* userData = NULL );
-    inline void Add( wxWindow *window, const wxSizerFlags& flags );
-    inline void Add( wxSizer *sizer, const wxSizerFlags& flags );
-    inline void Add( wxSizerItem *item );
+                     wxObject* userData = NULL);
+    wxSizerItem* Add( wxWindow *window, const wxSizerFlags& flags);
+    wxSizerItem* Add( wxSizer *sizer, const wxSizerFlags& flags);
+    wxSizerItem* Add( wxSizerItem *item);

 
 

-    inline void AddSpacer(int size);
-    inline void AddStretchSpacer(int prop = 1);
+    wxSizerItem* AddSpacer(int size);
+    wxSizerItem* AddStretchSpacer(int prop = 1);

 
 

-    inline void Insert( size_t index,
+    wxSizerItem* Insert(size_t index,

                         wxWindow *window,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,
                         wxWindow *window,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,

-                        wxObject* userData = NULL );
-    inline void Insert( size_t index,
+                        wxObject* userData = NULL);
+    wxSizerItem* Insert(size_t index,

                         wxSizer *sizer,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,
                         wxSizer *sizer,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,

-                        wxObject* userData = NULL );
-    inline void Insert( size_t index,
+                        wxObject* userData = NULL);
+    wxSizerItem* Insert(size_t index,

                         int width,
                         int height,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,
                         int width,
                         int height,
                         int proportion = 0,
                         int flag = 0,
                         int border = 0,

-                        wxObject* userData = NULL );
-    inline void Insert( size_t index,
+                        wxObject* userData = NULL);
+    wxSizerItem* Insert(size_t index,

                         wxWindow *window,
                         wxWindow *window,

-                        const wxSizerFlags& flags );
-    inline void Insert( size_t index,
+                        const wxSizerFlags& flags);
+    wxSizerItem* Insert(size_t index,

                         wxSizer *sizer,
                         wxSizer *sizer,

-                        const wxSizerFlags& flags );
-    virtual void Insert( size_t index, wxSizerItem *item );
+                        const wxSizerFlags& flags);
+    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);

 
 

-    inline void InsertSpacer(size_t index, int size);
-    inline void InsertStretchSpacer(size_t index, int prop = 1);
+    wxSizerItem* InsertSpacer(size_t index, int size);
+    wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);

 
 

-    inline void Prepend( wxWindow *window,
+    wxSizerItem* Prepend(wxWindow *window,

                          int proportion = 0,
                          int flag = 0,
                          int border = 0,
                          int proportion = 0,
                          int flag = 0,
                          int border = 0,

-                         wxObject* userData = NULL );
-    inline void Prepend( wxSizer *sizer,
+                         wxObject* userData = NULL);
+    wxSizerItem* Prepend(wxSizer *sizer,

                          int proportion = 0,
                          int flag = 0,
                          int border = 0,
                          int proportion = 0,
                          int flag = 0,
                          int border = 0,

-                         wxObject* userData = NULL );
-    inline void Prepend( int width,
+                         wxObject* userData = NULL);
+    wxSizerItem* Prepend(int width,

                          int height,
                          int proportion = 0,
                          int flag = 0,
                          int border = 0,
                          int height,
                          int proportion = 0,
                          int flag = 0,
                          int border = 0,

-                         wxObject* userData = NULL );
-    inline void Prepend( wxWindow *window, const wxSizerFlags& flags );
-    inline void Prepend( wxSizer *sizer, const wxSizerFlags& flags );
-    inline void Prepend( wxSizerItem *item );
+                         wxObject* userData = NULL);
+    wxSizerItem* Prepend(wxWindow *window, const wxSizerFlags& flags);
+    wxSizerItem* Prepend(wxSizer *sizer, const wxSizerFlags& flags);
+    wxSizerItem* Prepend(wxSizerItem *item);

 
 

-    inline void PrependSpacer(int size);
-    inline void PrependStretchSpacer(int prop = 1);
+    wxSizerItem* PrependSpacer(int size);
+    wxSizerItem* PrependStretchSpacer(int prop = 1);

 
 

+    // set (or possibly unset if window is NULL) or get the window this sizer
+    // is used in
+    void SetContainingWindow(wxWindow *window);
+    wxWindow *GetContainingWindow() const { return m_containingWindow; }

 
 

+#if WXWIN_COMPATIBILITY_2_6

     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );
     // Deprecated in 2.6 since historically it does not delete the window,
     // use Detach instead.
     wxDEPRECATED( virtual bool Remove( wxWindow *window ) );

+#endif // WXWIN_COMPATIBILITY_2_6
+

     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int index );
 
     virtual bool Remove( wxSizer *sizer );
     virtual bool Remove( int index );
 


@@ -360,29 +532,33 @@ public:
     virtual bool Detach( wxSizer *sizer );
     virtual bool Detach( int index );
 
     virtual bool Detach( wxSizer *sizer );
     virtual bool Detach( int index );
 

+    virtual bool Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive = false );
+    virtual bool Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive = false );
+    virtual bool Replace( size_t index, wxSizerItem *newitem );
+

     virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();
 
     void SetMinSize( int width, int height )
         { DoSetMinSize( width, height ); }
     virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();
 
     void SetMinSize( int width, int height )
         { DoSetMinSize( width, height ); }

-    void SetMinSize( wxSize size )
+    void SetMinSize( const wxSize& size )

         { DoSetMinSize( size.x, size.y ); }
 
         { DoSetMinSize( size.x, size.y ); }
 

-    /* Searches recursively */
+    // Searches recursively

     bool SetItemMinSize( wxWindow *window, int width, int height )
         { return DoSetItemMinSize( window, width, height ); }
     bool SetItemMinSize( wxWindow *window, int width, int height )
         { return DoSetItemMinSize( window, width, height ); }

-    bool SetItemMinSize( wxWindow *window, wxSize size )
+    bool SetItemMinSize( wxWindow *window, const wxSize& size )

         { return DoSetItemMinSize( window, size.x, size.y ); }
 
         { return DoSetItemMinSize( window, size.x, size.y ); }
 

-    /* Searches recursively */
+    // Searches recursively

     bool SetItemMinSize( wxSizer *sizer, int width, int height )
         { return DoSetItemMinSize( sizer, width, height ); }
     bool SetItemMinSize( wxSizer *sizer, int width, int height )
         { return DoSetItemMinSize( sizer, width, height ); }

-    bool SetItemMinSize( wxSizer *sizer, wxSize size )
+    bool SetItemMinSize( wxSizer *sizer, const wxSize& size )

         { return DoSetItemMinSize( sizer, size.x, size.y ); }
 
     bool SetItemMinSize( size_t index, int width, int height )
         { return DoSetItemMinSize( index, width, height ); }
         { return DoSetItemMinSize( sizer, size.x, size.y ); }
 
     bool SetItemMinSize( size_t index, int width, int height )
         { return DoSetItemMinSize( index, width, height ); }

-    bool SetItemMinSize( size_t index, wxSize size )
+    bool SetItemMinSize( size_t index, const wxSize& size )

         { return DoSetItemMinSize( index, size.x, size.y ); }
 
     wxSize GetSize() const
         { return DoSetItemMinSize( index, size.x, size.y ); }
 
     wxSize GetSize() const


@@ -390,11 +566,15 @@ public:
     wxPoint GetPosition() const
         { return m_position; }
 
     wxPoint GetPosition() const
         { return m_position; }
 

-    /* Calculate the minimal size or return m_minSize if bigger. */
+    // Calculate the minimal size or return m_minSize if bigger.

     wxSize GetMinSize();
 
     wxSize GetMinSize();
 

-    virtual void RecalcSizes() = 0;
+    // These virtual functions are used by the layout algorithm: first
+    // CalcMin() is called to calculate the minimal size of the sizer and
+    // prepare for laying it out and then RecalcSizes() is called to really
+    // update all the sizer items

     virtual wxSize CalcMin() = 0;
     virtual wxSize CalcMin() = 0;

+    virtual void RecalcSizes() = 0;

 
     virtual void Layout();
 
 
     virtual void Layout();
 


@@ -405,6 +585,8 @@ public:
 
     wxSizerItemList& GetChildren()
         { return m_children; }
 
     wxSizerItemList& GetChildren()
         { return m_children; }

+    const wxSizerItemList& GetChildren() const
+        { return m_children; }

 
     void SetDimension( int x, int y, int width, int height );
 
 
     void SetDimension( int x, int y, int width, int height );
 


@@ -432,17 +614,21 @@ public:
     // Recursively call wxWindow::Show () on all sizer items.
     virtual void ShowItems (bool show);
 
     // Recursively call wxWindow::Show () on all sizer items.
     virtual void ShowItems (bool show);
 

+    void Show(bool show) { ShowItems(show); }
+

 protected:
     wxSize              m_size;
     wxSize              m_minSize;
     wxPoint             m_position;
     wxSizerItemList     m_children;
 
 protected:
     wxSize              m_size;
     wxSize              m_minSize;
     wxPoint             m_position;
     wxSizerItemList     m_children;
 

+    // the window this sizer is used in, can be NULL
+    wxWindow *m_containingWindow;
+

     wxSize GetMaxWindowSize( wxWindow *window ) const;
     wxSize GetMinWindowSize( wxWindow *window );
     wxSize GetMaxClientSize( wxWindow *window ) const;
     wxSize GetMinClientSize( wxWindow *window );
     wxSize GetMaxWindowSize( wxWindow *window ) const;
     wxSize GetMinWindowSize( wxWindow *window );
     wxSize GetMaxClientSize( wxWindow *window ) const;
     wxSize GetMinClientSize( wxWindow *window );

-    wxSize FitSize( wxWindow *window );

     wxSize VirtualFitSize( wxWindow *window );
 
     virtual void DoSetMinSize( int width, int height );
     wxSize VirtualFitSize( wxWindow *window );
 
     virtual void DoSetMinSize( int width, int height );


@@ -548,8 +734,7 @@ public:
 
 protected:
     void AdjustForFlexDirection();
 
 protected:
     void AdjustForFlexDirection();

-    void AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
-                            int nrows, int ncols);
+    void AdjustForGrowables(const wxSize& sz);

 
     // the heights/widths of all rows/columns
     wxArrayInt  m_rowHeights,
 
     // the heights/widths of all rows/columns
     wxArrayInt  m_rowHeights,


@@ -583,24 +768,80 @@ private:
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {
 public:
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {
 public:

-    wxBoxSizer( int orient );
+    wxBoxSizer(int orient)
+    {
+        m_orient = orient;

 
 

-    void RecalcSizes();
-    wxSize CalcMin();
+        wxASSERT_MSG( m_orient == wxHORIZONTAL || m_orient == wxVERTICAL,
+                      _T("invalid value for wxBoxSizer orientation") );
+    }
+
+    int GetOrientation() const { return m_orient; }

 
 

-    int GetOrientation() const
-        { return m_orient; }
+    bool IsVertical() const { return m_orient == wxVERTICAL; }

 
 

-    void SetOrientation(int orient)
-        { m_orient = orient; }
+    void SetOrientation(int orient) { m_orient = orient; }
+
+    // implementation of our resizing logic
+    virtual wxSize CalcMin();
+    virtual void RecalcSizes();

 
 protected:
 
 protected:

+    // helpers for our code: this returns the component of the given wxSize in
+    // the direction of the sizer and in the other direction, respectively
+    int SizeInMajorDir(const wxSize& sz) const
+    {
+        return m_orient == wxHORIZONTAL ? sz.x : sz.y;
+    }
+
+    int& SizeInMajorDir(wxSize& sz)
+    {
+        return m_orient == wxHORIZONTAL ? sz.x : sz.y;
+    }
+
+    int& PosInMajorDir(wxPoint& pt)
+    {
+        return m_orient == wxHORIZONTAL ? pt.x : pt.y;
+    }
+
+    int SizeInMinorDir(const wxSize& sz) const
+    {
+        return m_orient == wxHORIZONTAL ? sz.y : sz.x;
+    }
+
+    int& SizeInMinorDir(wxSize& sz)
+    {
+        return m_orient == wxHORIZONTAL ? sz.y : sz.x;
+    }
+
+    int& PosInMinorDir(wxPoint& pt)
+    {
+        return m_orient == wxHORIZONTAL ? pt.y : pt.x;
+    }
+
+    // another helper: creates wxSize from major and minor components
+    wxSize SizeFromMajorMinor(int major, int minor) const
+    {
+        if ( m_orient == wxHORIZONTAL )
+        {
+            return wxSize(major, minor);
+        }
+        else // wxVERTICAL
+        {
+            return wxSize(minor, major);
+        }
+    }
+
+
+    // either wxHORIZONTAL or wxVERTICAL

     int m_orient;
     int m_orient;

-    int m_stretchable;
-    int m_minWidth;
-    int m_minHeight;
-    int m_fixedWidth;
-    int m_fixedHeight;
+
+    // the sum of proportion of all of our elements
+    int m_totalProportion;
+
+    // the minimal size needed for this sizer as calculated by the last call to
+    // our CalcMin()
+    wxSize m_minSize;

 
 private:
     DECLARE_CLASS(wxBoxSizer)
 
 private:
     DECLARE_CLASS(wxBoxSizer)


@@ -617,7 +858,9 @@ class WXDLLEXPORT wxStaticBox;
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 public:

-    wxStaticBoxSizer( wxStaticBox *box, int orient );
+    wxStaticBoxSizer(wxStaticBox *box, int orient);
+    wxStaticBoxSizer(int orient, wxWindow *win, const wxString& label = wxEmptyString);
+    virtual ~wxStaticBoxSizer();

 
     void RecalcSizes();
     wxSize CalcMin();
 
     void RecalcSizes();
     wxSize CalcMin();


@@ -628,6 +871,10 @@ public:
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
 
     // override to hide/show the static box as well
     virtual void ShowItems (bool show);
 

+    virtual bool Detach( wxWindow *window );
+    virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); }
+    virtual bool Detach( int index ) { return wxBoxSizer::Detach(index); }
+

 protected:
     wxStaticBox   *m_staticBox;
 
 protected:
     wxStaticBox   *m_staticBox;
 


@@ -638,169 +885,181 @@ private:
 
 #endif // wxUSE_STATBOX
 
 
 #endif // wxUSE_STATBOX
 

+#if wxUSE_BUTTON

 
 

-#if WXWIN_COMPATIBILITY_2_4
-// NB: wxBookCtrlSizer and wxNotebookSizer are deprecated, they
-//     don't do anything. wxBookCtrl::DoGetBestSize does the job now.
-
-// ----------------------------------------------------------------------------
-// wxBookCtrlSizer
-// ----------------------------------------------------------------------------
-
-#if wxUSE_BOOKCTRL
-
-// this sizer works with wxNotebook/wxListbook/... and sizes the control to
-// fit its pages
-class WXDLLEXPORT wxBookCtrl;
-
-class WXDLLEXPORT wxBookCtrlSizer : public wxSizer
+class WXDLLEXPORT wxStdDialogButtonSizer: public wxBoxSizer

 {
 public:
 {
 public:

-    wxDEPRECATED( wxBookCtrlSizer(wxBookCtrl *bookctrl) );
-
-    wxBookCtrl *GetControl() const { return m_bookctrl; }
-
-    virtual void RecalcSizes();
-    virtual wxSize CalcMin();
+    // Constructor just creates a new wxBoxSizer, not much else.
+    // Box sizer orientation is automatically determined here:
+    // vertical for PDAs, horizontal for everything else?
+    wxStdDialogButtonSizer();
+
+    // Checks button ID against system IDs and sets one of the pointers below
+    // to this button. Does not do any sizer-related things here.
+    void AddButton(wxButton *button);
+
+    // Use these if no standard ID can/should be used
+    void SetAffirmativeButton( wxButton *button );
+    void SetNegativeButton( wxButton *button );
+    void SetCancelButton( wxButton *button );
+
+    // All platform-specific code here, checks which buttons exist and add
+    // them to the sizer accordingly.
+    // Note - one potential hack on Mac we could use here,
+    // if m_buttonAffirmative is wxID_SAVE then ensure wxID_SAVE
+    // is set to _("Save") and m_buttonNegative is set to _("Don't Save")
+    // I wouldn't add any other hacks like that into here,
+    // but this one I can see being useful.
+    void Realize();
+
+    wxButton *GetAffirmativeButton() const { return m_buttonAffirmative; }
+    wxButton *GetApplyButton() const { return m_buttonApply; }
+    wxButton *GetNegativeButton() const { return m_buttonNegative; }
+    wxButton *GetCancelButton() const { return m_buttonCancel; }
+    wxButton *GetHelpButton() const { return m_buttonHelp; }

 
 protected:
 
 protected:

-    // this protected ctor lets us mark the real one above as deprecated
-    // and still have warning-free build of the library itself:
-    wxBookCtrlSizer() {}
-
-    wxBookCtrl *m_bookctrl;
+    wxButton *m_buttonAffirmative;  // wxID_OK, wxID_YES, wxID_SAVE go here
+    wxButton *m_buttonApply;        // wxID_APPLY
+    wxButton *m_buttonNegative;     // wxID_NO
+    wxButton *m_buttonCancel;       // wxID_CANCEL, wxID_CLOSE
+    wxButton *m_buttonHelp;         // wxID_HELP, wxID_CONTEXT_HELP

 
 private:
 
 private:

-    DECLARE_CLASS(wxBookCtrlSizer)
-    DECLARE_NO_COPY_CLASS(wxBookCtrlSizer)
+    DECLARE_CLASS(wxStdDialogButtonSizer)
+    DECLARE_NO_COPY_CLASS(wxStdDialogButtonSizer)

 };
 
 };
 

+#endif // wxUSE_BUTTON

 
 

-#if wxUSE_NOTEBOOK

 
 

-// before wxBookCtrl we only had wxNotebookSizer, keep it for backwards
-// compatibility
-class WXDLLEXPORT wxNotebook;
+// ----------------------------------------------------------------------------
+// inline functions implementation
+// ----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxNotebookSizer : public wxBookCtrlSizer
+#if WXWIN_COMPATIBILITY_2_8
+
+inline void wxSizerItem::SetWindow(wxWindow *window)

 {
 {

-public:
-    wxDEPRECATED( wxNotebookSizer(wxNotebook *nb) );
+    DoSetWindow(window);
+}

 
 

-    wxNotebook *GetNotebook() const { return (wxNotebook *)m_bookctrl; }
+inline void wxSizerItem::SetSizer(wxSizer *sizer)
+{
+    DoSetSizer(sizer);
+}

 
 

-private:
-    DECLARE_CLASS(wxNotebookSizer)
-    DECLARE_NO_COPY_CLASS(wxNotebookSizer)
-};
+inline void wxSizerItem::SetSpacer(const wxSize& size)
+{
+    DoSetSpacer(size);
+}

 
 

-#endif // wxUSE_NOTEBOOK
+inline void wxSizerItem::SetSpacer(int width, int height)
+{ 
+    DoSetSpacer(wxSize(width, height)); 
+} 

 
 

-#endif // wxUSE_BOOKCTRL
+#endif // WXWIN_COMPATIBILITY_2_8

 
 

-#endif // WXWIN_COMPATIBILITY_2_4

 
 

-// ----------------------------------------------------------------------------
-// inline functions implementation
-// ----------------------------------------------------------------------------
+inline wxSizerItem*
+wxSizer::Add( wxSizerItem *item )
+{
+    return Insert( m_children.GetCount(), item );
+}

 
 

-inline void
+inline wxSizerItem*

 wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {

-    Add( new wxSizerItem( window, proportion, flag, border, userData ) );
+    return Add( new wxSizerItem( window, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
 {

-    Add( new wxSizerItem( sizer, proportion, flag, border, userData ) );
+    return Add( new wxSizerItem( sizer, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData )
 {

-    Add( new wxSizerItem( width, height, proportion, flag, border, userData ) );
+    return Add( new wxSizerItem( width, height, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Add( wxWindow *window, const wxSizerFlags& flags )
 {
 wxSizer::Add( wxWindow *window, const wxSizerFlags& flags )
 {

-    Add( new wxSizerItem(window, flags) );
+    return Add( new wxSizerItem(window, flags) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Add( wxSizer *sizer, const wxSizerFlags& flags )
 {
 wxSizer::Add( wxSizer *sizer, const wxSizerFlags& flags )
 {

-    Add( new wxSizerItem(sizer, flags) );
+    return Add( new wxSizerItem(sizer, flags) );

 }
 
 }
 

-inline void
-wxSizer::Add( wxSizerItem *item )
+inline wxSizerItem*
+wxSizer::AddSpacer(int size)

 {
 {

-    Insert( m_children.GetCount(), item );
+    return Add(size, size);

 }
 
 }
 

-inline void
-wxSizer::AddSpacer(int size)
+inline wxSizerItem*
+wxSizer::AddStretchSpacer(int prop)

 {
 {

-    Add(size, size);
+    return Add(0, 0, prop);

 }
 
 }
 

-inline void
-wxSizer::AddStretchSpacer(int prop)
+inline wxSizerItem*
+wxSizer::Prepend( wxSizerItem *item )

 {
 {

-    Add(0, 0, prop);
+    return Insert( 0, item );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
 {

-    Prepend( new wxSizerItem( window, proportion, flag, border, userData ) );
+    return Prepend( new wxSizerItem( window, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
 {

-    Prepend( new wxSizerItem( sizer, proportion, flag, border, userData ) );
+    return Prepend( new wxSizerItem( sizer, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData )
 {
 wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData )
 {

-    Prepend( new wxSizerItem( width, height, proportion, flag, border, userData ) );
+    return Prepend( new wxSizerItem( width, height, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
-wxSizer::Prepend( wxSizerItem *item )
-{
-    Insert( 0, item );
-}
-
-inline void
+inline wxSizerItem*

 wxSizer::PrependSpacer(int size)
 {
 wxSizer::PrependSpacer(int size)
 {

-    Prepend(size, size);
+    return Prepend(size, size);

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::PrependStretchSpacer(int prop)
 {
 wxSizer::PrependStretchSpacer(int prop)
 {

-    Prepend(0, 0, prop);
+    return Prepend(0, 0, prop);

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Prepend( wxWindow *window, const wxSizerFlags& flags )
 {
 wxSizer::Prepend( wxWindow *window, const wxSizerFlags& flags )
 {

-    Prepend( new wxSizerItem(window, flags) );
+    return Prepend( new wxSizerItem(window, flags) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Prepend( wxSizer *sizer, const wxSizerFlags& flags )
 {
 wxSizer::Prepend( wxSizer *sizer, const wxSizerFlags& flags )
 {

-    Prepend( new wxSizerItem(sizer, flags) );
+    return Prepend( new wxSizerItem(sizer, flags) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Insert( size_t index,
                  wxWindow *window,
                  int proportion,
 wxSizer::Insert( size_t index,
                  wxWindow *window,
                  int proportion,


@@ -808,10 +1067,10 @@ wxSizer::Insert( size_t index,
                  int border,
                  wxObject* userData )
 {
                  int border,
                  wxObject* userData )
 {

-    Insert( index, new wxSizerItem( window, proportion, flag, border, userData ) );
+    return Insert( index, new wxSizerItem( window, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Insert( size_t index,
                  wxSizer *sizer,
                  int proportion,
 wxSizer::Insert( size_t index,
                  wxSizer *sizer,
                  int proportion,


@@ -819,10 +1078,10 @@ wxSizer::Insert( size_t index,
                  int border,
                  wxObject* userData )
 {
                  int border,
                  wxObject* userData )
 {

-    Insert( index, new wxSizerItem( sizer, proportion, flag, border, userData ) );
+    return Insert( index, new wxSizerItem( sizer, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Insert( size_t index,
                  int width,
                  int height,
 wxSizer::Insert( size_t index,
                  int width,
                  int height,


@@ -831,33 +1090,31 @@ wxSizer::Insert( size_t index,
                  int border,
                  wxObject* userData )
 {
                  int border,
                  wxObject* userData )
 {

-    Insert( index, new wxSizerItem( width, height, proportion, flag, border, userData ) );
+    return Insert( index, new wxSizerItem( width, height, proportion, flag, border, userData ) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Insert( size_t index, wxWindow *window, const wxSizerFlags& flags )
 {
 wxSizer::Insert( size_t index, wxWindow *window, const wxSizerFlags& flags )
 {

-    Insert( index, new wxSizerItem(window, flags) );
+    return Insert( index, new wxSizerItem(window, flags) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::Insert( size_t index, wxSizer *sizer, const wxSizerFlags& flags )
 {
 wxSizer::Insert( size_t index, wxSizer *sizer, const wxSizerFlags& flags )
 {

-    Insert( index, new wxSizerItem(sizer, flags) );
+    return Insert( index, new wxSizerItem(sizer, flags) );

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::InsertSpacer(size_t index, int size)
 {
 wxSizer::InsertSpacer(size_t index, int size)
 {

-    Insert(index, size, size);
+    return Insert(index, size, size);

 }
 
 }
 

-inline void
+inline wxSizerItem*

 wxSizer::InsertStretchSpacer(size_t index, int prop)
 {
 wxSizer::InsertStretchSpacer(size_t index, int prop)
 {

-    Insert(index, 0, 0, prop);
+    return Insert(index, 0, 0, prop);

 }
 
 }
 

-

 #endif // __WXSIZER_H__
 #endif // __WXSIZER_H__

-