From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 14 Mar 2005 16:37:02 +0000 (+0000)
Subject: More PocketPC adaptations
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e5c990b3a6b63f70550a6dc1f34482f1e459b90b

More PocketPC adaptations


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

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index 3999f2f0bd..f4afa3c769 100644
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -170,8 +170,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,12 +187,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
+
+#ifndef __WXWINCE__
     sizer->Add( CreateButtonSizer(wxOK), 0, wxCENTRE | wxALL, 10 );
+#endif
 
     // activate
     SetSizer(sizer);
 
-#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+#ifdef __WXWINCE__
     Layout();
 #else
     sizer->SetSizeHints(this);
diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 023237c41b..691c979971 100644
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -183,8 +183,9 @@ bool LifeApp::OnInit()
 // --------------------------------------------------------------------------
 
 // frame constructor
-LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
-    _("Life!"), wxDefaultPosition )
+LifeFrame::LifeFrame() : 
+  wxFrame( (wxFrame *) NULL, wxID_ANY, _("Life!"), wxDefaultPosition ),
+  m_navigator(NULL)
 {
     // frame icon
     SetIcon(wxICON(mondrian));
@@ -198,12 +199,15 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
     menuFile->Append(wxID_NEW, wxGetStockLabel(wxID_NEW), _("Start a new game"));
     menuFile->Append(wxID_OPEN, wxGetStockLabel(wxID_OPEN), _("Open an existing Life pattern"));
     menuFile->Append(ID_SAMPLES, _("&Sample game..."), _("Select a sample configuration"));
+#ifndef __WXWINCE__
     menuFile->AppendSeparator();
     menuFile->Append(wxID_EXIT, wxGetStockLabel(wxID_EXIT, true, _T("Alt-X")), _("Quit this program"));
 
     menuView->Append(ID_SHOWNAV, _("Navigation &toolbox"), _("Show or hide toolbox"), wxITEM_CHECK);
     menuView->Check(ID_SHOWNAV, true);
     menuView->AppendSeparator();
+#endif
+
     menuView->Append(ID_ORIGIN, _("&Absolute origin"), _("Go to (0, 0)"));
     menuView->Append(ID_CENTER, _("&Center of mass"), _("Find center of mass"));
     menuView->Append(ID_NORTH, _("&North"), _("Find northernmost cell"));
@@ -327,15 +331,17 @@ LifeFrame::LifeFrame() : wxFrame( (wxFrame *) NULL, wxID_ANY,
     sizer3->Add( panel1, 1, wxGROW );
     sizer3->Add( panel2, 0, wxGROW );
     SetSizer( sizer3 );
+
 #ifndef __WXWINCE__
     sizer3->Fit( this );
 
     // set minimum frame size
     sizer3->SetSizeHints( this );
-#endif
 
-    // navigator frame
+    // navigator frame - not appropriate for small devices
     m_navigator = new LifeNavigator(this);
+#endif
+
 }
 
 LifeFrame::~LifeFrame()
@@ -407,7 +413,8 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
         case ID_SHOWNAV:
         {
             bool checked = GetMenuBar()->GetMenu(1)->IsChecked(ID_SHOWNAV);
-            m_navigator->Show(checked);
+            if (m_navigator)
+                m_navigator->Show(checked);
             break;
         }
         case ID_INFO: