diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp index 4d1328172d..c71d8a241d 100644 --- a/demos/forty/forty.cpp +++ b/demos/forty/forty.cpp @@ -75,7 +75,13 @@ FortyApp::~FortyApp() bool FortyApp::OnInit() { bool largecards = false; - m_dir = wxGetCwd(); +#ifndef __WXWINCE__ + m_helpFile = wxGetCwd() + wxFILE_SEP_PATH + wxT("about.htm"); + if (!wxFileExists(m_helpFile)) +#endif + { + m_helpFile = wxPathOnly(argv[0]) + wxFILE_SEP_PATH + wxT("about.htm"); + } wxSize size(668,510); @@ -234,8 +240,7 @@ void FortyFrame::Help(wxCommandEvent& event) { #if wxUSE_HTML - wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm"); - if (wxFileExists(htmlFile)) + if (wxFileExists(wxGetApp().GetHelpFile())) { FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions")); if (dialog.ShowModal() == wxID_OK) @@ -326,7 +331,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent) { #if wxUSE_HTML wxString htmlText; - wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm"); + wxString htmlFile = wxGetApp().GetHelpFile(); { wxTextFile file(htmlFile); diff --git a/demos/forty/forty.h b/demos/forty/forty.h index d3a24d8cff..2b8a93005a 100644 --- a/demos/forty/forty.h +++ b/demos/forty/forty.h @@ -23,13 +23,13 @@ public: static const wxColour& BackgroundColour(); static const wxColour& TextColour(); static const wxBrush& BackgroundBrush(); - const wxString& GetDir() const { return m_dir; } + const wxString& GetHelpFile() const { return m_helpFile; } private: static wxColour* m_backgroundColour; static wxColour* m_textColour; static wxBrush* m_backgroundBrush; - wxString m_dir; + wxString m_helpFile; }; DECLARE_APP(FortyApp)