Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 41da10945d0adad0577c6ae1d0dd3d62602f6018..7d20b548c8bffc6eb4cbdfd6f4f15e1e3cb7ec91 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Created:
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Created:

-// RCS-ID:      $Id$

 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Robin Dunn, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -126,8 +125,8 @@ public:
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
         wxCHECK_MSG( !(direction & ~wxALL), *this,
     wxSizerFlags& Border(int direction, int borderInPixels)
     {
         wxCHECK_MSG( !(direction & ~wxALL), *this,

-                     wxS("direction must be a combination of wxDirection enum "
-                         "values.") );
+                     wxS("direction must be a combination of wxDirection ")
+                     wxS("enum values.") );

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


@@ -715,6 +714,10 @@ public:
 
     void Show(bool show) { ShowItems(show); }
 
 
     void Show(bool show) { ShowItems(show); }
 

+    // This is the ShowItems() counterpart and returns true if any of the sizer
+    // items are shown.
+    virtual bool AreAnyItemsShown() const;
+

 protected:
     wxSize              m_size;
     wxSize              m_minSize;
 protected:
     wxSize              m_size;
     wxSize              m_minSize;


@@ -810,7 +813,7 @@ protected:
             "Can't calculate number of cols if number of rows is not specified"
         );
 
             "Can't calculate number of cols if number of rows is not specified"
         );
 

-        return (m_children.GetCount() + m_rows - 1) / m_rows;
+        return int(m_children.GetCount() + m_rows - 1) / m_rows;

     }
 
     int CalcRows() const
     }
 
     int CalcRows() const


@@ -821,7 +824,7 @@ protected:
             "Can't calculate number of cols if number of rows is not specified"
         );
 
             "Can't calculate number of cols if number of rows is not specified"
         );
 

-        return (m_children.GetCount() + m_cols - 1) / m_cols;
+        return int(m_children.GetCount() + m_cols - 1) / m_cols;

     }
 
 private:
     }
 
 private:


@@ -1033,6 +1036,7 @@ 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 AreAnyItemsShown() const;

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