Follow OnOK changes in wxDialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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,
|
FortyAboutDialog::FortyAboutDialog( wxWindow *parent, wxWindowID id, const wxString &title,
|
||||||
const wxPoint &position, const wxSize& size, long style ) :
|
const wxPoint &position, const wxSize& size, long style ) :
|
||||||
wxDialog( parent, id, title, position, size, style )
|
wxDialog( parent, id, title, position, size, style )
|
||||||
@@ -367,6 +363,7 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
|
|||||||
wxButton *item2 = new wxButton( parent, wxID_CLOSE );
|
wxButton *item2 = new wxButton( parent, wxID_CLOSE );
|
||||||
item2->SetDefault();
|
item2->SetDefault();
|
||||||
item2->SetFocus();
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -85,9 +85,6 @@ public:
|
|||||||
long style = wxDEFAULT_DIALOG_STYLE );
|
long style = wxDEFAULT_DIALOG_STYLE );
|
||||||
|
|
||||||
bool AddControls(wxWindow* parent);
|
bool AddControls(wxWindow* parent);
|
||||||
|
|
||||||
private:
|
|
||||||
DECLARE_EVENT_TABLE()
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define ID_ABOUT_HTML_WINDOW 1000
|
#define ID_ABOUT_HTML_WINDOW 1000
|
||||||
|
Reference in New Issue
Block a user