From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 9 Feb 2003 08:56:54 +0000 (+0000)
Subject: code changed along msw lines
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/81b41c03c6bcbffa9293a0e280729ffaaf9ef2c7

code changed along msw lines


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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 1ef72057f8..b0daaad685 100644
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
+	if ( !IsModal() )
+	{
+	    SetModal(TRUE);
+	}
+
+	Show(TRUE);
+	return GetReturnCode();
 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless
diff --git a/src/mac/dialog.cpp b/src/mac/dialog.cpp
index 1ef72057f8..b0daaad685 100644
--- a/src/mac/dialog.cpp
+++ b/src/mac/dialog.cpp
@@ -209,9 +209,13 @@ void wxDialog::DoShowModal()
 // Replacement for Show(TRUE) for modal dialogs - returns return code
 int wxDialog::ShowModal()
 {
-  m_windowStyle |= wxDIALOG_MODAL;
-  Show(TRUE);
-  return GetReturnCode();
+	if ( !IsModal() )
+	{
+	    SetModal(TRUE);
+	}
+
+	Show(TRUE);
+	return GetReturnCode();
 }
 
 // NB: this function (surprizingly) may be called for both modal and modeless