More likely to find the about.htm instructions now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 0b4e23f8f319d57a1d1bfc2041d1d659a3056616..4d1328172d6413b402b5a973514dd54ed7a2a523 100644 (file)
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -75,6 +75,7 @@ FortyApp::~FortyApp()
 bool FortyApp::OnInit()
 {
     bool largecards = false;
 bool FortyApp::OnInit()
 {
     bool largecards = false;

+    m_dir = wxGetCwd();

 
     wxSize size(668,510);
 
 
     wxSize size(668,510);
 


@@ -233,7 +234,8 @@ void
 FortyFrame::Help(wxCommandEvent& event)
 {
 #if wxUSE_HTML
 FortyFrame::Help(wxCommandEvent& event)
 {
 #if wxUSE_HTML

-    if (wxFileExists(wxT("about.htm")))
+    wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm");
+    if (wxFileExists(htmlFile))

     {
         FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
         if (dialog.ShowModal() == wxID_OK)
     {
         FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
         if (dialog.ShowModal() == wxID_OK)


@@ -324,13 +326,9 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
 {
 #if wxUSE_HTML
     wxString htmlText;
 {
 #if wxUSE_HTML
     wxString htmlText;

-    wxString htmlFile(wxT("about.htm"));
+    wxString htmlFile = wxGetApp().GetDir() + wxFILE_SEP_PATH + wxT("about.htm");

 
 

-    //if (!wxGetApp().GetMemoryTextResource(wxT("about.htm"), htmlText))

     {
     {

-//        wxSetWorkingDirectory(wxGetApp().GetAppDir());
-//        wxString htmlFile(wxGetApp().GetFullAppPath(wxT("about.htm")));
-        

         wxTextFile file(htmlFile);
         if (file.Exists())
         {
         wxTextFile file(htmlFile);
         if (file.Exists())
         {


@@ -347,11 +345,6 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     }
 
     // Customize the HTML
     }
 
     // Customize the HTML

-#if 0
-    wxString verString;
-    verString.Printf("%.2f", stVERSION_NUMBER);
-    htmlText.Replace(wxT("$VERSION$"), verString);
-#endif

     htmlText.Replace(wxT("$DATE$"), _T(__DATE__));
 
     wxSize htmlSize(400, 290);
     htmlText.Replace(wxT("$DATE$"), _T(__DATE__));
 
     wxSize htmlSize(400, 290);

diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index 3663738bc3c1cf71e51a83dd4534d7ff0c8cce56..d3a24d8cffa8939faeb927cbe312ed94c98209fc 100644 (file)
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -23,13 +23,17 @@ public:
     static const wxColour& BackgroundColour();
     static const wxColour& TextColour();
     static const wxBrush&  BackgroundBrush();
     static const wxColour& BackgroundColour();
     static const wxColour& TextColour();
     static const wxBrush&  BackgroundBrush();

+    const wxString& GetDir() const { return m_dir; }

 
 private:
     static wxColour* m_backgroundColour;
     static wxColour* m_textColour;
     static wxBrush*  m_backgroundBrush;
 
 private:
     static wxColour* m_backgroundColour;
     static wxColour* m_textColour;
     static wxBrush*  m_backgroundBrush;

+    wxString m_dir;

 };
 
 };
 

+DECLARE_APP(FortyApp)
+

 class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 class FortyCanvas;
 class FortyFrame: public wxFrame
 {