fixed creation of the dialogs with a simple (non 3D, non resizeable) border; also...

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

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index f4f80eac16a7c683d357cdc1a390543764073a48..cf63a5124a3e1a958381ccbcdc879d4dbc298403 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -41,7 +41,7 @@
 // resources
 // --------------------------------------------------------------------------
 
 // resources
 // --------------------------------------------------------------------------
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)

     // application icon
     #include "mondrian.xpm"
 
     // application icon
     #include "mondrian.xpm"
 


@@ -443,7 +443,7 @@ void LifeFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
 
     if (filedlg.ShowModal() == wxID_OK)
     {
 
     if (filedlg.ShowModal() == wxID_OK)
     {

-        wxFileInputStream stream(filedlg.GetFilename());
+        wxFileInputStream stream(filedlg.GetPath());

         LifeReader reader(stream);
 
         // the reader handles errors itself, no need to do anything here
         LifeReader reader(stream);
 
         // the reader handles errors itself, no need to do anything here


@@ -602,7 +602,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
         bmpe = wxBITMAP(east),  
         bmps = wxBITMAP(south);
 
         bmpe = wxBITMAP(east),  
         bmps = wxBITMAP(south);
 

-#if !defined(__WXGTK__) && !defined(__WXMOTIF__)
+#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__)

     bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
     bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
     bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));
     bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
     bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
     bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));