added support for leaving out <embedded objects> that are created during their parent...

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

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index b7df5569d79ff8c3e642c2a7117530632a788172..b6d1a7ae58e381a8af483591e169fb354cfd15af 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -41,7 +41,7 @@
 // resources
 // --------------------------------------------------------------------------
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     // application icon
     #include "mondrian.xpm"
 
@@ -194,9 +194,9 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(200, 200)
     SetIcon(wxICON(mondrian));
 
     // menu bar
-    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
-    wxMenu *menuView = new wxMenu("", wxMENU_TEAROFF);
-    wxMenu *menuGame = new wxMenu("", wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *menuView = new wxMenu(_T(""), wxMENU_TEAROFF);
+    wxMenu *menuGame = new wxMenu(_T(""), wxMENU_TEAROFF);
 
     menuFile->Append(ID_NEW, _("&New"), _("Start a new game"));
     menuFile->Append(ID_OPEN, _("&Open..."), _("Open an existing Life pattern"));
@@ -634,11 +634,14 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
     sizer1->Add( sizer2 );
     sizer1->Add( bs, 0, wxCENTRE | wxSOUTH, 4 );
 
-    // set the miniframe size
+    // set the panel and miniframe size
     panel->SetSizer(sizer1);
     panel->SetAutoLayout(TRUE);
-    sizer1->Fit(this);
-    sizer1->SetSizeHints(this);
+
+    sizer1->Fit(panel);
+    SetClientSize(panel->GetSize());
+    wxSize sz = GetSize();
+    SetSizeHints(sz.x, sz.y, sz.x, sz.y);
 
     // move it to a sensible position
     wxRect parentRect = parent->GetRect();
@@ -1054,7 +1057,7 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
     else
     if (type == wxEVT_SCROLLWIN_PAGEDOWN)
     {
-        scrollinc = -10;
+        scrollinc = +10;
     }
     else
     if (type == wxEVT_SCROLLWIN_THUMBTRACK)