Follow OnOK changes in wxDialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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;
 }

-

diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index 91b847749db4bb056b7f9a43a25e466c076bf545..27635901510bd09c12ac3c9e3495fc1c2b2fc195 100644 (file)
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -85,9 +85,6 @@ public:
         long style = wxDEFAULT_DIALOG_STYLE );
 
     bool AddControls(wxWindow* parent);
         long style = wxDEFAULT_DIALOG_STYLE );
 
     bool AddControls(wxWindow* parent);

-
-private:
-    DECLARE_EVENT_TABLE()

 };
 
 #define ID_ABOUT_HTML_WINDOW    1000
 };
 
 #define ID_ABOUT_HTML_WINDOW    1000