only call fsync() on disk files, otherwise we get an error for pipes under Unix

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index a91079626d5f6add362b741a7aca90f22201db79..0ef04619c6d76757e5f98f6fea06367a81c1f58d 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -395,7 +395,7 @@ void wxSizerItem::DeleteWindows()
             m_window->Destroy();
             //Putting this after the switch will result in a spacer
             //not being deleted properly on destruction
             m_window->Destroy();
             //Putting this after the switch will result in a spacer
             //not being deleted properly on destruction

-            m_kind = Item_None; 
+            m_kind = Item_None;

             break;
 
         case Item_Sizer:
             break;
 
         case Item_Sizer:


@@ -440,7 +440,8 @@ bool wxSizerItem::IsShown() const
     switch ( m_kind )
     {
         case Item_None:
     switch ( m_kind )
     {
         case Item_None:

-            wxFAIL_MSG( _T("uninitialized sizer item") );
+            // we may be called from CalcMin(), just return false so that we're
+            // not used

             break;
 
         case Item_Window:
             break;
 
         case Item_Window:


@@ -1053,23 +1054,19 @@ bool wxSizer::IsShown( size_t index ) const
 //---------------------------------------------------------------------------
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
 //---------------------------------------------------------------------------
 
 wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )

-    : m_rows( rows )
+    : m_rows( ( cols == 0 && rows == 0 ) ? 1 : rows )

     , m_cols( cols )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {
     , m_cols( cols )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {

-    if (m_rows == 0 && m_cols == 0)
-        m_rows = 1;

 }
 
 wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
 }
 
 wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )

-    : m_rows( 0 )
+    : m_rows( cols == 0 ? 1 : 0 )

     , m_cols( cols )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {
     , m_cols( cols )
     , m_vgap( vgap )
     , m_hgap( hgap )
 {

-    if (m_rows == 0 && m_cols == 0)
-        m_rows = 1;

 }
 
 int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
 }
 
 int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const


@@ -1892,7 +1889,7 @@ void wxStdDialogButtonSizer::Realize()
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x);
 #else
         // GTK+1 and any other platform
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x);
 #else
         // GTK+1 and any other platform

-        
+

         // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog
         if (m_buttonHelp)
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
         // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog
         if (m_buttonHelp)
             Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);