[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[5706] trunk/src/transdialog.cpp

[<vo...@us...>]

Revision: 5706
          http://sourceforge.net/p/moneymanagerex/code/5706
Author:   vomikan
Date:     2013-12-23 12:26:26 +0000 (Mon, 23 Dec 2013)
Log Message:
-----------
revert some previous changes

Modified Paths:
--------------
    trunk/src/transdialog.cpp

Modified: trunk/src/transdialog.cpp
===================================================================
--- trunk/src/transdialog.cpp	2013-12-23 09:08:55 UTC (rev 5705)
+++ trunk/src/transdialog.cpp	2013-12-23 12:26:26 UTC (rev 5706)
@@ -993,18 +993,22 @@
 
 void mmTransDialog::OnCancel(wxCommandEvent& /*event*/)
 {
-    if (object_in_focus_ == bCategory_->GetId()) EndModal(wxID_CANCEL);
-    if (object_in_focus_ == textNotes_->GetId()) EndModal(wxID_CANCEL);
+#if defined (__WXMAC__)
+    Modal(wxID_CANCEL);
+#endif
 
+    if (object_in_focus_ == bCategory_->GetId()) return;
+    if (object_in_focus_ == textNotes_->GetId()) return;
+
     if (object_in_focus_ == cbPayee_->GetId())
     {
         if (!cbPayee_->GetValue().IsEmpty()) {
             cbPayee_->SetValue("");
-            EndModal(wxID_CANCEL);
+            return;
         }
         else {
             itemButtonCancel_->SetFocus();
-            EndModal(wxID_CANCEL);
+            return;
         }
     }
 
@@ -1012,11 +1016,11 @@
     {
         if (!textAmount_->IsEmpty()) {
             textAmount_->SetValue("");
-            EndModal(wxID_CANCEL);
+            return;
         }
         else {
             itemButtonCancel_->SetFocus();
-            EndModal(wxID_CANCEL);
+            return;
         }
     }
 
@@ -1024,11 +1028,11 @@
     {
         if (!toTextAmount_->IsEmpty()) {
             toTextAmount_->SetValue("");
-            EndModal(wxID_CANCEL);
+            return;
         }
         else {
             itemButtonCancel_->SetFocus();
-            EndModal(wxID_CANCEL);
+            return;
         }
     }
 
@@ -1038,7 +1042,7 @@
             textNumber_->SetValue("");
         else
             itemButtonCancel_->SetFocus();
-        EndModal(wxID_CANCEL);
+        return;
     }
 
     EndModal(wxID_CANCEL);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.