Very minor changes

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

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index bc041cb3ea72e2e8849ada3e138b38597f11780f..fedac9e0b99f0973a314f0372767c5f26c2e10a3 100644 (file)
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -54,9 +54,6 @@
 // IDs for the controls and the menu commands
 enum
 {
-    // bmp window in about dialog
-    ID_BMPWIN = 2001,
-
     // listbox in samples dialog
     ID_LISTBOX
 };
@@ -68,7 +65,6 @@ enum
 // Event tables
 BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
     EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox)
-    
 END_EVENT_TABLE()
 
 
@@ -185,10 +181,10 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
     sizer->Add( sbmp, 0, wxCENTRE | wxALL, 10 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );
-    sizer->Add( CreateTextSizer(_("Life! for wxWindows, version 2.0\n\n"
+    sizer->Add( CreateTextSizer(_("Life! version 2.0 for wxWindows\n\n"
                                   "(c) 2000 Guillermo Rodriguez Garcia\n\n"
                                   "<guille@iies.es>\n\n"
-                                  "Portions of the code are based in XLife\n"
+                                  "Portions of the code are based in XLife;\n"
                                   "XLife is (c) 1989 by Jon Bennett et al.")),
                                   0, wxCENTRE | wxALL, 20 );
     sizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 5 );

diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index 6178c756a92c46a08fd32594d30bf1549307fd07..4946b676f2493bdbcb54c5c761967da08bb99ad4 100644 (file)
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __WIN16__
+#error "Sorry, Life! will not work in 16-bit Windows"
+#endif
+
 // ==========================================================================
 // headers, declarations, constants
 // ==========================================================================
@@ -44,15 +48,9 @@
 
 #define HASH(x, y) (((x >> 3) & 0x7f) << 7) + ((y >> 3) & 0x7f)
 
-#ifdef __WIN16__
-#define HASHSIZE   10000
-#else
 #define HASHSIZE   32768
-#endif
-
 #define MAXDEAD    8
 
-
 class CellBox
 {
 public:

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 4dba59107b2bcdeb0e0d0cba3f91b19359c2a957..d8b6bb9150510cee516735bee99f0147cfaf4f09 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -539,7 +539,6 @@ void LifeCanvas::DrawChanged()
                       TRUE);
    
     dc.BeginDrawing();
-    dc.SetLogicalFunction(wxINVERT);
 
     if (m_cellsize == 1)
     {
@@ -550,6 +549,7 @@ void LifeCanvas::DrawChanged()
         dc.SetPen(*wxTRANSPARENT_PEN);
         dc.SetBrush(*wxBLACK_BRUSH);
     }
+    dc.SetLogicalFunction(wxINVERT);
 
     while (!done)
     {