connect the affirmative/cancel button handlers to new ids, not old ones

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

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index ec34631b674f4477bd9b18b319b5db9bf5734b86..730b2c300f551873554befb1ba439465e111632f 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -458,16 +458,16 @@ void wxDialogBase::SetAffirmativeId(int affirmativeId)
     }
     //else: wxID_OK is always handled
 
     }
     //else: wxID_OK is always handled
 

+    m_affirmativeId = affirmativeId;
+

     // connect the handler to the new button
     // connect the handler to the new button

-    if ( affirmativeId != wxID_NONE )
+    if ( m_affirmativeId != wxID_NONE )

     {
         Connect(m_affirmativeId,
                 wxEVT_COMMAND_BUTTON_CLICKED,
                 wxCommandEventHandler(wxDialogBase::OnAffirmativeButton));
     }
     //else: no affirmative button
     {
         Connect(m_affirmativeId,
                 wxEVT_COMMAND_BUTTON_CLICKED,
                 wxCommandEventHandler(wxDialogBase::OnAffirmativeButton));
     }
     //else: no affirmative button

-
-    m_affirmativeId = affirmativeId;

 }
 
 void wxDialogBase::SetEscapeId(int escapeId)
 }
 
 void wxDialogBase::SetEscapeId(int escapeId)


@@ -491,15 +491,15 @@ void wxDialogBase::SetEscapeId(int escapeId)
     }
     //else: wxID_CANCEL is always handled
 
     }
     //else: wxID_CANCEL is always handled
 

+    m_escapeId = escapeId;
+

     // connect the handler to the new button
     // connect the handler to the new button

-    if ( escapeId != wxID_NONE )
+    if ( m_escapeId != wxID_NONE )

     {
         Connect(m_escapeId,
                 wxEVT_COMMAND_BUTTON_CLICKED,
                 wxCommandEventHandler(wxDialogBase::OnCancelButton));
     }
     {
         Connect(m_escapeId,
                 wxEVT_COMMAND_BUTTON_CLICKED,
                 wxCommandEventHandler(wxDialogBase::OnCancelButton));
     }

-
-    m_escapeId = escapeId;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------