Use wxFindWindowAtPoint() for hit testing in wxPopupTransientWindow.

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

diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index 119b06bb3cdf7e5574511046001e1f955aae9d18..df47436d1a30259b9f42fc7e2e158e37a2865b5f 100644 (file)
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -4,7 +4,6 @@
 // Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
 // Modified by:
 // Created:     Jan/2000
 // Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
 // Modified by:
 // Created:     Jan/2000

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000, Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000, Guillermo Rodriguez Garcia
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,10 +12,6 @@
 // headers, declarations, constants
 // ==========================================================================
 
 // headers, declarations, constants
 // ==========================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "game.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -35,7 +30,7 @@
 #include <string.h>           // for memset
 
 
 #include <string.h>           // for memset
 
 

-#define ARRAYSIZE  1024       // static array for BeginFind & co.
+#define CELLSARRAYSIZE  1024       // static array for BeginFind & co.

 #define ALLOCBOXES 16         // number of cellboxes to alloc at once
 #define MAXDEAD    8          // tics before removing cellbox from list
 
 #define ALLOCBOXES 16         // number of cellboxes to alloc at once
 #define MAXDEAD    8          // tics before removing cellbox from list
 


@@ -127,7 +122,7 @@ Life::Life()
         m_boxes[i] = NULL;
 
     // state vars for BeginFind & FindMore
         m_boxes[i] = NULL;
 
     // state vars for BeginFind & FindMore

-    m_cells       = new LifeCell[ARRAYSIZE];
+    m_cells       = new LifeCell[CELLSARRAYSIZE];

     m_ncells      = 0;
     m_findmore    = false;
     m_changed     = false;
     m_ncells      = 0;
     m_findmore    = false;
     m_changed     = false;


@@ -528,7 +523,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
                     continue;
 
                 // check whether there is enough space left in the array
                     continue;
 
                 // check whether there is enough space left in the array

-                if (m_ncells > (ARRAYSIZE - 64))
+                if (m_ncells > (CELLSARRAYSIZE - 64))

                 {
                     *ncells = m_ncells;
                     return false;
                 {
                     *ncells = m_ncells;
                     return false;


@@ -553,7 +548,7 @@ bool Life::FindMore(LifeCell *cells[], size_t *ncells)
                     continue;
 
                 // check whether there is enough space left in the array
                     continue;
 
                 // check whether there is enough space left in the array

-                if (m_ncells > (ARRAYSIZE - 64))
+                if (m_ncells > (CELLSARRAYSIZE - 64))

                 {
                     *ncells = m_ncells;
                     return false;
                 {
                     *ncells = m_ncells;
                     return false;