void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
{
if (IsModal())
+ {
EndModal(wxID_CANCEL);
+ }
else
{
SetReturnCode(wxID_CANCEL);
if ( Validate() && TransferDataFromWindow())
{
if (IsModal())
+ {
EndModal(wxID_OK);
+ }
else
{
SetReturnCode(wxID_OK);
this->Show(FALSE);
};
};
- EndModal( wxID_OK );
};
void wxDialog::OnPaint( wxPaintEvent& WXUNUSED(event) )
static wxList closing;
if (closing.Member(this)) return FALSE; // no loops
-
+
closing.Append(this);
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);