fix wxStringOutputStream to deal with NUL bytes correctly (incidentally fixes bug...

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

diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index 4c503cf4e3590749c0f30e0bec7e91dc4c0704f5..5a44246c90ae307aa6626e7929bf5117740f24bb 100644 (file)
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -12,55 +12,10 @@
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 

-#ifdef __GNUG__
-    #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 "wx/spinctrl.h"
-

 #include "life.h"
 #include "game.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
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // LifeSamplesDialog
 // --------------------------------------------------------------------------


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

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

 
     // members
 
     // members

-    int GetValue();
+    const LifePattern& GetPattern();

 
     // event handlers
     void OnListBox(wxCommandEvent &event);
 
 private:
 
     // event handlers
     void OnListBox(wxCommandEvent &event);
 
 private:

-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE();
+    // any class wishing to process wxWidgets events must use this macro
+    DECLARE_EVENT_TABLE()

 
     int         m_value;
     wxListBox  *m_list;
 
     int         m_value;
     wxListBox  *m_list;


@@ -89,4 +44,16 @@ private:
     Life       *m_life;
 };
 
     Life       *m_life;
 };
 

+// --------------------------------------------------------------------------
+// LifeAboutDialog
+// --------------------------------------------------------------------------
+
+class LifeAboutDialog : public wxDialog
+{
+public:
+    // ctor
+    LifeAboutDialog(wxWindow *parent);
+};
+
+

 #endif  // _LIFE_DIALOGS_H_
 #endif  // _LIFE_DIALOGS_H_