added wxEncodingConverter - scripts for creating convertion tables

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

diff --git a/samples/forty/forty.cpp b/samples/forty/forty.cpp
index 570fe85df035ba8a8afcf8a28adba51f2f0245f9..bfdb920f0666d2703aba59e51a58709ec5c66ca4 100644 (file)
--- a/samples/forty/forty.cpp
+++ b/samples/forty/forty.cpp
@@ -40,7 +40,7 @@ public:
        FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h);
        virtual ~FortyFrame();
 
-       bool OnClose();
+       void OnCloseWindow(wxCloseEvent& event);
 
        // Menu callbacks
        void NewGame(wxCommandEvent& event);
@@ -73,6 +73,7 @@ BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
        EVT_MENU(SCORES, FortyFrame::Scores)
        EVT_MENU(RIGHT_BUTTON_UNDO, FortyFrame::ToggleRightButtonUndo)
        EVT_MENU(HELPING_HAND, FortyFrame::ToggleHelpingHand)
+    EVT_CLOSE(FortyFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
 // Create a new application object
@@ -90,10 +91,10 @@ bool FortyApp::OnInit()
                        -1, -1, 668, 510
                        );
 
-       // Show the frame
+       // Show the frame
        frame->Show(TRUE);
 
-       return true;
+       return TRUE;
 }
 
 const wxColour& FortyApp::BackgroundColour()
@@ -130,6 +131,10 @@ const wxColour& FortyApp::TextColour()
 FortyFrame::FortyFrame(wxFrame* frame, char* title, int x, int y, int w, int h):
        wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
+#ifdef __WXMAC__
+       // we need this in order to allow the about menu relocation, since ABOUT is not the default id of the about menu 
+       wxApp::s_macAboutMenuItemId = ABOUT ;
+#endif
        // set the icon
 #ifdef __WXMSW__
        SetIcon(wxIcon("CardsIcon"));
@@ -189,9 +194,14 @@ FortyFrame::~FortyFrame()
 {
 }
 
-bool FortyFrame::OnClose()
+void FortyFrame::OnCloseWindow(wxCloseEvent& event)
 {
-       return m_canvas->OnClose();
+    if (m_canvas->OnCloseCanvas() )
+    {
+        this->Destroy();
+    }
+    else
+        event.Veto();
 }
 
 void
@@ -205,7 +215,7 @@ FortyFrame::Exit(wxCommandEvent&)
 {
 #ifdef __WXGTK__
        // wxGTK doesn't call OnClose() so we do it here
-       if (OnClose())
+//     if (OnClose())
 #endif
        Close(TRUE);
 }