Try to avoid accidental use of wxXmlNode in XRC handlers.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 289b765d80f2beeb7ac9eff95f4b9af1a9a4571e..7e01ff8ad9b80a238aae2d04bc56fe5f326cd65c 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -125,6 +125,10 @@ public:
 
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
 
     wxSizerFlags& Border(int direction, int borderInPixels)
     {

+        wxCHECK_MSG( !(direction & ~wxALL), *this,
+                     wxS("direction must be a combination of wxDirection ")
+                     wxS("enum values.") );
+

         m_flags &= ~wxALL;
         m_flags |= direction;
 
         m_flags &= ~wxALL;
         m_flags |= direction;
 


@@ -251,10 +255,10 @@ class WXDLLIMPEXP_CORE wxSizerItem : public wxObject
 public:
     // window
     wxSizerItem( wxWindow *window,
 public:
     // window
     wxSizerItem( wxWindow *window,

-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData );
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL );

 
     // window with flags
     wxSizerItem(wxWindow *window, const wxSizerFlags& flags)
 
     // window with flags
     wxSizerItem(wxWindow *window, const wxSizerFlags& flags)


@@ -266,10 +270,10 @@ public:
 
     // subsizer
     wxSizerItem( wxSizer *sizer,
 
     // subsizer
     wxSizerItem( wxSizer *sizer,

-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData );
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL );

 
     // sizer with flags
     wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)
 
     // sizer with flags
     wxSizerItem(wxSizer *sizer, const wxSizerFlags& flags)


@@ -282,10 +286,10 @@ public:
     // spacer
     wxSizerItem( int width,
                  int height,
     // spacer
     wxSizerItem( int width,
                  int height,

-                 int proportion,
-                 int flag,
-                 int border,
-                 wxObject* userData);
+                 int proportion=0,
+                 int flag=0,
+                 int border=0,
+                 wxObject* userData=NULL);

 
     // spacer with flags
     wxSizerItem(int width, int height, const wxSizerFlags& flags)
 
     // spacer with flags
     wxSizerItem(int width, int height, const wxSizerFlags& flags)


@@ -311,6 +315,10 @@ public:
         { return m_minSize; }
     wxSize GetMinSizeWithBorder() const;
 
         { return m_minSize; }
     wxSize GetMinSizeWithBorder() const;
 

+    wxSize GetMaxSize() const
+        { return IsWindow() ? m_window->GetMaxSize() : wxDefaultSize; }
+    wxSize GetMaxSizeWithBorder() const;
+

     void SetMinSize(const wxSize& size)
     {
         if ( IsWindow() )
     void SetMinSize(const wxSize& size)
     {
         if ( IsWindow() )


@@ -436,6 +444,10 @@ protected:
     void DoSetSizer(wxSizer *sizer);
     void DoSetSpacer(const wxSize& size);
 
     void DoSetSizer(wxSizer *sizer);
     void DoSetSpacer(const wxSize& size);
 

+    // Add the border specified for this item to the given size
+    // if it's != wxDefaultSize, just return wxDefaultSize otherwise.
+    wxSize AddBorderToSize(const wxSize& size) const;
+

     // discriminated union: depending on m_kind one of the fields is valid
     enum
     {
     // discriminated union: depending on m_kind one of the fields is valid
     enum
     {


@@ -510,7 +522,7 @@ public:
     wxSizerItem* Add( int width, int height, const wxSizerFlags& flags);
     wxSizerItem* Add( wxSizerItem *item);
 
     wxSizerItem* Add( int width, int height, const wxSizerFlags& flags);
     wxSizerItem* Add( wxSizerItem *item);
 

-    wxSizerItem* AddSpacer(int size);
+    virtual wxSizerItem *AddSpacer(int size);

     wxSizerItem* AddStretchSpacer(int prop = 1);
 
     wxSizerItem* Insert(size_t index,
     wxSizerItem* AddStretchSpacer(int prop = 1);
 
     wxSizerItem* Insert(size_t index,


@@ -542,7 +554,11 @@ public:
                         int width,
                         int height,
                         const wxSizerFlags& flags);
                         int width,
                         int height,
                         const wxSizerFlags& flags);

-    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item);
+
+    // NB: do _not_ override this function in the derived classes, this one is
+    //     virtual for compatibility reasons only to allow old code overriding
+    //     it to continue to work, override DoInsert() instead in the new code
+    virtual wxSizerItem* Insert(size_t index, wxSizerItem *item);

 
     wxSizerItem* InsertSpacer(size_t index, int size);
     wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);
 
     wxSizerItem* InsertSpacer(size_t index, int size);
     wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);


@@ -597,7 +613,7 @@ public:
     virtual void DeleteWindows();
 
     // Inform sizer about the first direction that has been decided (by parent item)
     virtual void DeleteWindows();
 
     // Inform sizer about the first direction that has been decided (by parent item)

-    // Returns true if it made use of the informtion (and recalculated min size)
+    // Returns true if it made use of the information (and recalculated min size)

     virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
         { return false; }
 
     virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
         { return false; }
 


@@ -661,6 +677,10 @@ public:
         m_position = pos;
         m_size = size;
         Layout();
         m_position = pos;
         m_size = size;
         Layout();

+
+        // This call is required for wxWrapSizer to be able to calculate its
+        // minimal size correctly.
+        InformFirstDirection(wxHORIZONTAL, size.x, size.y);

     }
     void SetDimension(int x, int y, int width, int height)
         { SetDimension(wxPoint(x, y), wxSize(width, height)); }
     }
     void SetDimension(int x, int y, int width, int height)
         { SetDimension(wxPoint(x, y), wxSize(width, height)); }


@@ -713,6 +733,10 @@ protected:
     virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
     virtual bool DoSetItemMinSize( size_t index, int width, int height );
 
     virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
     virtual bool DoSetItemMinSize( size_t index, int width, int height );
 

+    // insert a new item into m_children at given index and return the item
+    // itself
+    virtual wxSizerItem* DoInsert(size_t index, wxSizerItem *item);
+

 private:
     DECLARE_CLASS(wxSizer)
 };
 private:
     DECLARE_CLASS(wxSizer)
 };


@@ -733,8 +757,6 @@ public:
     wxGridSizer( int rows, int cols, int vgap, int hgap );
     wxGridSizer( int rows, int cols, const wxSize& gap );
 
     wxGridSizer( int rows, int cols, int vgap, int hgap );
     wxGridSizer( int rows, int cols, const wxSize& gap );
 

-    virtual wxSizerItem *Insert(size_t index, wxSizerItem *item);
-

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


@@ -774,6 +796,8 @@ protected:
     int    m_vgap;
     int    m_hgap;
 
     int    m_vgap;
     int    m_hgap;
 

+    virtual wxSizerItem *DoInsert(size_t index, wxSizerItem *item);
+

     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
     // returns the number of columns/rows needed for the current total number
     void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
 
     // returns the number of columns/rows needed for the current total number


@@ -913,6 +937,8 @@ public:
                       wxT("invalid value for wxBoxSizer orientation") );
     }
 
                       wxT("invalid value for wxBoxSizer orientation") );
     }
 

+    virtual wxSizerItem *AddSpacer(int size);
+

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


@@ -1103,6 +1129,12 @@ inline void wxSizerItem::SetSpacer(int width, int height)
 
 #endif // WXWIN_COMPATIBILITY_2_8
 
 
 #endif // WXWIN_COMPATIBILITY_2_8
 

+inline wxSizerItem*
+wxSizer::Insert(size_t index, wxSizerItem *item)
+{
+    return DoInsert(index, item);
+}
+

 
 inline wxSizerItem*
 wxSizer::Add( wxSizerItem *item )
 
 inline wxSizerItem*
 wxSizer::Add( wxSizerItem *item )