X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69067986c1f7354512f12e4b788506051b747a5b..9b8888f92220b617bd0edc047e513e4b242a0911:/contrib/samples/mmedia/mmboard.cpp diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp index 3015dd5308..62bf71c08c 100644 --- a/contrib/samples/mmedia/mmboard.cpp +++ b/contrib/samples/mmedia/mmboard.cpp @@ -16,9 +16,6 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "mmboard.h" -#endif // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -36,8 +33,9 @@ // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- + // the application icon -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if !defined(__WXMSW__) && !defined(__WXPM__) #include "mondrian.xpm" #endif @@ -425,8 +423,10 @@ void MMBoardFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) } // select a file to be opened +#if wxUSE_FILEDLG selected_file = wxLoadFileSelector(_T("multimedia"), _T("*"), NULL, this); - if (selected_file.IsNull()) +#endif // wxUSE_FILEDLG + if (selected_file.empty()) return; m_opened_file = MMBoardManager::Open(selected_file); @@ -590,4 +590,3 @@ void MMBoardFrame::OnSetPosition(wxCommandEvent& WXUNUSED(event)) UpdateMMedInfo(); } -