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 425f4202476ab9871b3e488c2216864892bc39ae..bfdb920f0666d2703aba59e51a58709ec5c66ca4 100644 (file)
--- a/samples/forty/forty.cpp
+++ b/samples/forty/forty.cpp
@@ -91,7 +91,7 @@ bool FortyApp::OnInit()
                        -1, -1, 668, 510
                        );
 
-       // Show the frame
+       // Show the frame
        frame->Show(TRUE);
 
        return TRUE;
@@ -131,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"));
@@ -192,7 +196,7 @@ FortyFrame::~FortyFrame()
 
 void FortyFrame::OnCloseWindow(wxCloseEvent& event)
 {
-       if (m_canvas->OnCloseCanvas())
+    if (m_canvas->OnCloseCanvas() )
     {
         this->Destroy();
     }