reSWIGged

[wxWidgets.git] / demos / life / dialogs.cpp

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index 3999f2f0bd9e65d84de38dcc1ca11b743163b4ba..27c74fa9184ba73f57a2457132dd16e20b13703d 100644 (file)
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -124,9 +124,7 @@ LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
     // activate
     SetSizer(sizer3);
 
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    Layout();
-#else
+#if !defined(__POCKETPC__) && !defined(__SMARTPHONE__)
     sizer3->SetSizeHints(this);
     sizer3->Fit(this);
     Centre(wxBOTH | wxCENTRE_ON_SCREEN);
@@ -170,8 +168,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
                           wxDefaultPosition, wxDefaultSize)
 {
     // logo
-    wxBitmap bmp(life_xpm);
-    wxStaticBitmap *sbmp = new wxStaticBitmap(this, wxID_ANY, bmp);
+    wxStaticBitmap *sbmp = new wxStaticBitmap(this, wxID_ANY, wxBitmap(life_xpm));
 
     // layout components
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
@@ -188,14 +185,15 @@ XLife is (c) 1989 by Jon Bennett et al.")),
 #if wxUSE_STATLINE
     sizer->Add( new wxStaticLine(this, wxID_ANY), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
 #endif // wxUSE_STATLINE
+
+#if ! (defined(__SMARTPHONE__) || defined(__POCKETPC__))
     sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );
+#endif
 
     // activate
     SetSizer(sizer);
 
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-    Layout();
-#else
+#if ! (defined(__SMARTPHONE__) || defined(__POCKETPC__))
     sizer->SetSizeHints(this);
     sizer->Fit(this);
     Centre(wxBOTH | wxCENTRE_ON_SCREEN);