(should) fix unix compilation...

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

diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index 4c503cf4e3590749c0f30e0bec7e91dc4c0704f5..f5ebd0a32c29b6b77c21269dd604bac2667e4326 100644 (file)
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -12,7 +12,7 @@
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "dialogs.h"
 #endif
 
@@ -28,39 +28,10 @@
     #include "wx/wx.h"
 #endif
 
-#include "wx/spinctrl.h"
-
 #include "life.h"
 #include "game.h"
 
 
-// sample configurations
-extern LifeShape g_shapes[];
-
-
-// --------------------------------------------------------------------------
-// LifeNewGameDialog
-// --------------------------------------------------------------------------
-
-class LifeNewGameDialog : public wxDialog
-{
-public:
-    // ctor
-    LifeNewGameDialog(wxWindow *parent, int *w, int *h);
-
-    // event handlers
-    void OnOK(wxCommandEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE();
-
-    int        *m_w;
-    int        *m_h;
-    wxSpinCtrl *m_spinctrlw;
-    wxSpinCtrl *m_spinctrlh;
-};
-
 // --------------------------------------------------------------------------
 // LifeSamplesDialog
 // --------------------------------------------------------------------------
@@ -73,14 +44,14 @@ public:
     ~LifeSamplesDialog();
 
     // members
-    int GetValue();
+    const LifePattern& GetPattern();
 
     // event handlers
     void OnListBox(wxCommandEvent &event);
 
 private:
     // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
     int         m_value;
     wxListBox  *m_list;
@@ -89,4 +60,16 @@ private:
     Life       *m_life;
 };
 
+// --------------------------------------------------------------------------
+// LifeAboutDialog
+// --------------------------------------------------------------------------
+
+class LifeAboutDialog : public wxDialog
+{
+public:
+    // ctor
+    LifeAboutDialog(wxWindow *parent);
+};
+
+
 #endif  // _LIFE_DIALOGS_H_