Follow CreateButtonSizer interface change.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index 36e98059a7d70c7b6a767e268a104e8797b9826f..627f71ac6de95ba5f3f91d9f1e350b73e6c6aaa1 100644 (file)
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -129,15 +129,10 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
 #endif // wxUSE_STATLINE
     sizer3->Add( sizer2, 1, wxGROW | wxALL, 5 );
 
 #endif // wxUSE_STATLINE
     sizer3->Add( sizer2, 1, wxGROW | wxALL, 5 );
 

-    wxSizer *buttonSizer = CreateButtonSizer( wxOK|wxCANCEL , true, 10 );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
+    wxSizer *sizerBtns = CreateButtonSizer(wxOK|wxCANCEL);
+    if ( sizerBtns )

     {
     {

-        sizer3->Add( buttonSizer, 0, wxEXPAND | wxALL, 10 );
-    }
-    else
-    {
-        sizer3->AddSpacer( 10 );
-        delete buttonSizer;
+        sizer3->Add(sizerBtns, wxSizerFlags().Expand().Border());

     }
 
     // activate
     }
 
     // activate


@@ -202,15 +197,10 @@ XLife is (c) 1989 by Jon Bennett et al.")),
                                   0, wxCENTRE | wxRIGHT|wxLEFT|wxTOP, 20 );
 
     // buttons if any
                                   0, wxCENTRE | wxRIGHT|wxLEFT|wxTOP, 20 );
 
     // buttons if any

-    wxSizer *buttonSizer = CreateButtonSizer( wxOK , true, 10 );
-    if(buttonSizer->GetChildren().GetCount() > 0 )
-    {
-        sizer->Add( buttonSizer, 0, wxEXPAND | wxALL, 10 );
-    }
-    else
+    wxSizer *sizerBtns = CreateButtonSizer(wxOK);
+    if ( sizerBtns )

     {
     {

-        sizer->AddSpacer( 20 );
-        delete buttonSizer;
+        sizer->Add(sizerBtns, wxSizerFlags().Expand().Border());

     }
 
     // activate
     }
 
     // activate