X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/764835a5d5b72c635527bfbb350d190c89381b44..cb7acf9cc78c309026bed1038631f2663cd90bda:/demos/life/life.cpp?ds=sidebyside diff --git a/demos/life/life.cpp b/demos/life/life.cpp index f4f80eac16..cf63a5124a 100644 --- a/demos/life/life.cpp +++ b/demos/life/life.cpp @@ -41,7 +41,7 @@ // resources // -------------------------------------------------------------------------- -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) // application icon #include "mondrian.xpm" @@ -443,7 +443,7 @@ void LifeFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) 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 @@ -602,7 +602,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent) 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));