Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved search for about.htm on mac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-08-07 21:59:45 +00:00
parent e50408bf8f
commit 236d7be301
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
demos/forty/forty.cpp
View File

@@ -75,7 +75,13 @@ FortyApp::~FortyApp()
bool FortyApp::OnInit() bool FortyApp::OnInit()
{ {
bool largecards = false; 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); wxSize size(668,510);
@@ -234,8 +240,7 @@ void
FortyFrame::Help(wxCommandEvent& event) FortyFrame::Help(wxCommandEvent& event)
{ {
#if wxUSE_HTML #if wxUSE_HTML
wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm"); if (wxFileExists(wxGetApp().GetHelpFile()))
if (wxFileExists(htmlFile))
{ {
FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions")); FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
@@ -326,7 +331,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
{ {
#if wxUSE_HTML #if wxUSE_HTML
wxString htmlText; wxString htmlText;
wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm"); wxString htmlFile = wxGetApp().GetHelpFile();
{ {
wxTextFile file(htmlFile); wxTextFile file(htmlFile);

4
demos/forty/forty.h
View File

@@ -23,13 +23,13 @@ public:
static const wxColour& BackgroundColour(); static const wxColour& BackgroundColour();
static const wxColour& TextColour(); static const wxColour& TextColour();
static const wxBrush& BackgroundBrush(); static const wxBrush& BackgroundBrush();
const wxString& GetDir() const { return m_dir; } const wxString& GetHelpFile() const { return m_helpFile; }
private: private:
static wxColour* m_backgroundColour; static wxColour* m_backgroundColour;
static wxColour* m_textColour; static wxColour* m_textColour;
static wxBrush* m_backgroundBrush; static wxBrush* m_backgroundBrush;
wxString m_dir; wxString m_helpFile;
}; };
DECLARE_APP(FortyApp) DECLARE_APP(FortyApp)