Forward port of r60190 (wxMSW Cairo support) to trunk.

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

diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index f5ebd0a32c29b6b77c21269dd604bac2667e4326..5a44246c90ae307aa6626e7929bf5117740f24bb 100644 (file)
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -12,22 +12,6 @@
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "dialogs.h"
-#endif
-
-// for compilers that support precompilation, includes "wx/wx.h"
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-// for all others, include the necessary headers
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-

 #include "life.h"
 #include "game.h"
 
 #include "life.h"
 #include "game.h"
 


@@ -41,7 +25,7 @@ class LifeSamplesDialog : public wxDialog
 public:
     // ctor and dtor
     LifeSamplesDialog(wxWindow *parent);
 public:
     // ctor and dtor
     LifeSamplesDialog(wxWindow *parent);

-    ~LifeSamplesDialog();
+    virtual ~LifeSamplesDialog();

 
     // members
     const LifePattern& GetPattern();
 
     // members
     const LifePattern& GetPattern();


@@ -50,7 +34,7 @@ public:
     void OnListBox(wxCommandEvent &event);
 
 private:
     void OnListBox(wxCommandEvent &event);
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 
     int         m_value;
     DECLARE_EVENT_TABLE()
 
     int         m_value;