Fix for assert in setting image from file by Jaakko Salli.

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

diff --git a/demos/forty/forty.cpp b/demos/forty/forty.cpp
index 5e3525e256313e0fe834eafe969efc08b711d7bf..350889ce4a047e0835ebc1d690b74192bbc5cfb3 100644 (file)
--- a/demos/forty/forty.cpp
+++ b/demos/forty/forty.cpp
@@ -304,10 +304,6 @@ FortyFrame::ToggleCardSize(wxCommandEvent& event)
 // stAboutDialog
 //----------------------------------------------------------------------------
 
 // stAboutDialog
 //----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(FortyAboutDialog,wxDialog)
-    EVT_BUTTON(wxID_CLOSE, wxDialog::OnOK)
-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 )
 FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
     const wxPoint &position, const wxSize& size, long style ) :
     wxDialog( parent, id, title, position, size, style )


@@ -367,6 +363,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
     wxButton *item2 = new wxButton( parent, wxID_CLOSE );
     item2->SetDefault();
     item2->SetFocus();
     wxButton *item2 = new wxButton( parent, wxID_CLOSE );
     item2->SetDefault();
     item2->SetFocus();

+    SetAffirmativeId(wxID_CLOSE);

 
     item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 5 );
 
 
     item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 5 );
 


@@ -378,4 +375,3 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
 
     return true;
 }
 
     return true;
 }

-