wxUSE_STL/wxArrayString fixes.

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

diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
index 95c266eb832410ed8d43cd730dd63230c3374367..723ff1c81d800866cc86eff331bdf7c03c56cb97 100644 (file)
--- a/demos/life/dialogs.h
+++ b/demos/life/dialogs.h
@@ -12,7 +12,7 @@
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 
 #ifndef _LIFE_DIALOGS_H_
 #define _LIFE_DIALOGS_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "dialogs.h"
 #endif
 
     #pragma interface "dialogs.h"
 #endif
 


@@ -28,8 +28,6 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#include "wx/spinctrl.h"
-

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


@@ -46,13 +44,13 @@ public:
     ~LifeSamplesDialog();
 
     // members
     ~LifeSamplesDialog();
 
     // members

-    const LifeShape& GetShape();
+    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
+    // any class wishing to process wxWidgets events must use this macro

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


@@ -73,4 +71,5 @@ public:
     LifeAboutDialog(wxWindow *parent);
 };
 
     LifeAboutDialog(wxWindow *parent);
 };
 

+

 #endif  // _LIFE_DIALOGS_H_
 #endif  // _LIFE_DIALOGS_H_