CodeWarrior dislikes #include <> syntax for in-tree headers, prefer ""

[wxWidgets.git] / demos / forty / forty.cpp

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 0b4e23f8f319d57a1d1bfc2041d1d659a3056616..7713b93d5009e9b81392371382a5a4543a1de5e3 100644 (file)
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -58,10 +58,6 @@ wxColour* FortyApp::m_backgroundColour = 0;
 wxColour* FortyApp::m_textColour = 0;
 wxBrush*  FortyApp::m_backgroundBrush = 0;
 
 wxColour* FortyApp::m_textColour = 0;
 wxBrush*  FortyApp::m_backgroundBrush = 0;
 

-FortyApp::FortyApp()
-{
-}
-

 FortyApp::~FortyApp()
 {
     delete m_backgroundColour;
 FortyApp::~FortyApp()
 {
     delete m_backgroundColour;


@@ -75,6 +71,13 @@ FortyApp::~FortyApp()
 bool FortyApp::OnInit()
 {
     bool largecards = false;
 bool FortyApp::OnInit()
 {
     bool largecards = false;

+#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);
 


@@ -203,10 +206,6 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

-FortyFrame::~FortyFrame()
-{
-}
-

 void FortyFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_canvas->OnCloseCanvas() )
 void FortyFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_canvas->OnCloseCanvas() )


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

-    if (wxFileExists(wxT("about.htm")))
+    if (wxFileExists(wxGetApp().GetHelpFile()))

     {
         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,19 +323,15 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
 {
 #if wxUSE_HTML
     wxString htmlText;
 {
 #if wxUSE_HTML
     wxString htmlText;

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

 
 

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

     {
     {

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

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

-            for ( htmlText = file.GetFirstLine(); 
-                  !file.Eof(); 
+            for ( htmlText = file.GetFirstLine();
+                  !file.Eof();

                   htmlText << file.GetNextLine() << _T("\n") ) ;
         }
     }
                   htmlText << file.GetNextLine() << _T("\n") ) ;
         }
     }


@@ -347,11 +342,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);


@@ -367,7 +357,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     wxHtmlWindow* html = new wxHtmlWindow(this, ID_ABOUT_HTML_WINDOW, wxDefaultPosition, htmlSize, borderStyle);
     html -> SetBorders(10);
     html -> SetPage(htmlText);
     wxHtmlWindow* html = new wxHtmlWindow(this, ID_ABOUT_HTML_WINDOW, wxDefaultPosition, htmlSize, borderStyle);
     html -> SetBorders(10);
     html -> SetPage(htmlText);

-        
+

     //// Start of sizer-based control creation
 
     wxSizer *item0 = new wxBoxSizer( wxVERTICAL );
     //// Start of sizer-based control creation
 
     wxSizer *item0 = new wxBoxSizer( wxVERTICAL );