streamlined WM_NOTIFY processing code fixing a bug with toolbar tooltips in presence...

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

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index a2a1cd4c5bac2a677fc5947533c0e8302f62668f..cb37828bef94330c925a72265e1e278b8fc97eaf 100644 (file)
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -31,40 +31,11 @@
 #include "forty.h"
 #include "card.h"
 #include "scoredg.h"
-#ifdef wx_x
-#include "cards.xbm"
-#endif
 
-class FortyFrame: public wxFrame
-{
-public:
-        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,bool largecards);
-       virtual ~FortyFrame();
-
-       void OnCloseWindow(wxCloseEvent& event);
-
-       // Menu callbacks
-       void NewGame(wxCommandEvent& event);
-       void Exit(wxCommandEvent& event);
-       void About(wxCommandEvent& event);
-       void Undo(wxCommandEvent& event);
-       void Redo(wxCommandEvent& event);
-       void Scores(wxCommandEvent& event);
-       void ToggleRightButtonUndo(wxCommandEvent& event);
-       void ToggleHelpingHand(wxCommandEvent& event);
-        void ToggleCardSize(wxCommandEvent& event);
-
-       DECLARE_EVENT_TABLE()
-
-private:
-       enum MenuCommands { NEW_GAME = 10, SCORES, EXIT,
-                                               UNDO, REDO,
-                                                RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS,
-                                               ABOUT };
-
-       wxMenuBar*              m_menuBar;
-       FortyCanvas*    m_canvas;
-};
+#if wxUSE_HTML
+#include "wx/file.h"
+#include "wx/html/htmlwin.h"
+#endif
 
 BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
        EVT_MENU(NEW_GAME, FortyFrame::NewGame)
@@ -86,6 +57,20 @@ wxColour* FortyApp::m_backgroundColour = 0;
 wxColour* FortyApp::m_textColour = 0;
 wxBrush*  FortyApp::m_backgroundBrush = 0;
 
+FortyApp::FortyApp()
+{
+}
+
+FortyApp::~FortyApp()
+{
+    delete m_backgroundColour;
+    delete m_textColour;
+    delete m_backgroundBrush;
+    delete Card::m_symbolBmap;
+    delete Card::m_pictureBmap;
+
+}
+
 bool FortyApp::OnInit()
 {
         bool largecards = FALSE;
@@ -106,6 +91,8 @@ bool FortyApp::OnInit()
        // Show the frame
        frame->Show(TRUE);
 
+        frame->GetCanvas()->ShowPlayerDialog();
+
        return TRUE;
 }
 
@@ -187,7 +174,7 @@ FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h,b
         optionsMenu->Check(LARGE_CARDS, largecards ? TRUE : FALSE);
 
        wxMenu* helpMenu = new wxMenu;
-       helpMenu->Append(ABOUT, "&About", "Displays program version information");
+       helpMenu->Append(ABOUT, "&About...", "Displays information about the game");
 
        m_menuBar = new wxMenuBar;
        m_menuBar->Append(gameMenu,    "&Game");
@@ -244,17 +231,29 @@ FortyFrame::Exit(wxCommandEvent&)
 void
 FortyFrame::About(wxCommandEvent&)
 {
-       wxMessageBox(
-               "Forty Thieves\n\n"
-               "A freeware program using the wxWindows\n"
-               "portable C++ GUI toolkit.\n"
-               "http://www.wxwindows.org\n"
-               "http://www.freiburg.linux.de/~wxxt\n\n"
-               "Author: Chris Breeze (c) 1992-1998\n"
-               "email: chris.breeze@iname.com",
-               "About Forty Thieves",
-               wxOK, this
-               );
+#if wxUSE_HTML
+    if (wxFileExists(wxT("about.htm")))
+    {
+        FortyAboutDialog dialog(this, -1, wxT("About Forty Thieves"));
+        if (dialog.ShowModal() == wxID_OK)
+        {
+        }
+    }
+    else
+#endif
+    {
+        wxMessageBox(
+            "Forty Thieves\n\n"
+            "A freeware program using the wxWindows\n"
+            "portable C++ GUI toolkit.\n"
+            "http://www.wxwindows.org\n"
+            "http://www.freiburg.linux.de/~wxxt\n\n"
+            "Author: Chris Breeze (c) 1992-1998\n"
+            "email: chris.breeze@iname.com",
+            "About Forty Thieves",
+            wxOK, this
+            );
+    }
 }
 
 void
@@ -300,4 +299,93 @@ FortyFrame::ToggleCardSize(wxCommandEvent& event)
         m_canvas->Refresh();
 }
 
+//----------------------------------------------------------------------------
+// stAboutDialog
+//----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(FortyAboutDialog,wxDialog)
+END_EVENT_TABLE()
+
+FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
+    const wxPoint &position, const wxSize& size, long style ) :
+    wxDialog( parent, id, title, position, size, style )
+{
+    AddControls(this);
+
+    Centre(wxBOTH);
+}
+
+bool FortyAboutDialog::AddControls(wxWindow* parent)
+{
+#if wxUSE_HTML
+    wxString htmlText;
+    wxString htmlFile(wxT("about.htm"));
+
+    //if (!wxGetApp().GetMemoryTextResource(wxT("about.htm"), htmlText))
+    {
+//        wxSetWorkingDirectory(wxGetApp().GetAppDir());
+//        wxString htmlFile(wxGetApp().GetFullAppPath(wxT("about.htm")));
+        
+        if (wxFileExists(htmlFile))
+        {
+            wxFile file;
+            file.Open(htmlFile, wxFile::read);
+            long len = file.Length();
+            char* buf = htmlText.GetWriteBuf(len + 1);
+            file.Read(buf, len);
+            buf[len] = 0;
+            htmlText.UngetWriteBuf();
+        }
+    }
+
+    if (htmlText.IsEmpty())
+    {
+        htmlText.Printf(wxT("<html><head><title>Warning</title></head><body><P>Sorry, could not find resource for About dialog<P></body></html>"));
+    }
+
+    // Customize the HTML
+#if 0
+    wxString verString;
+    verString.Printf("%.2f", stVERSION_NUMBER);
+    htmlText.Replace(wxT("$VERSION$"), verString);
+#endif
+    htmlText.Replace(wxT("$DATE$"), __DATE__);
+
+    wxSize htmlSize(400, 290);
+
+    // Note: in later versions of wxWin this will be fixed so wxRAISED_BORDER
+    // does the right thing. Meanwhile, this is a workaround.
+#ifdef __WXMSW__
+    long borderStyle = wxDOUBLE_BORDER;
+#else
+    long borderStyle = wxRAISED_BORDER;
+#endif
+
+    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 );
+
+    wxWindow *item1 = parent->FindWindow( ID_ABOUT_HTML_WINDOW );
+    wxASSERT( item1 );
+    item0->Add( item1, 0, wxALIGN_CENTRE|wxALL, 5 );
+
+    wxButton *item2 = new wxButton( parent, wxID_CANCEL, "&Close", wxDefaultPosition, wxDefaultSize, 0 );
+    item2->SetDefault();
+    item2->SetFocus();
+
+    item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 5 );
+
+    parent->SetAutoLayout( TRUE );
+    parent->SetSizer( item0 );
+    parent->Layout();
+    item0->Fit( parent );
+    item0->SetSizeHints( parent );
+#endif
+
+    return TRUE;
+}