Quick hack to rid the code of wxDIALOG_MODAL

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

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index e6834011c5979fc6bf71b51d62d69016a9e6717f..490cd0af5ce943c4423e6b03e80f21b525eb6c64 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:

-    wxDialog();
+    wxDialog() { Init(); }

 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,


@@ -39,9 +39,10 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+        Init();
+        m_isModalStyle = modal;

         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),

-               style | modalStyle, name);
+               style, name);

     }
 
     // Constructor with no modal flag - the new convention.
     }
 
     // Constructor with no modal flag - the new convention.


@@ -52,6 +53,7 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

+        Init();

         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 


@@ -98,6 +100,8 @@ public:
     void DoShowModal();
 
 private:
     void DoShowModal();
 
 private:

+    void Init();
+    bool m_isModalStyle;

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 9881fac0bdeac636ea22c687437931dce80b8286..af14cbc258062e4d719be4deb22e88d70c767c1e 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -44,9 +44,9 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

-wxDialog::wxDialog()
+void wxDialog::Init()

 {
 {

-    m_isShown = FALSE;
+    m_isModalStyle = false;

 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxDialog::Create(wxWindow *parent, wxWindowID id,


@@ -71,7 +71,7 @@ void wxDialog::SetModal(bool flag)
 {
     if ( flag )
     {
 {
     if ( flag )
     {

-        m_windowStyle |= wxDIALOG_MODAL;
+        m_isModalStyle = true;

 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON
 
         wxModelessWindows.DeleteObject(this);
 #if TARGET_CARBON


@@ -80,7 +80,7 @@ void wxDialog::SetModal(bool flag)
     }
     else
     {
     }
     else
     {

-        m_windowStyle &= ~wxDIALOG_MODAL;
+        m_isModalStyle = false;

 
         wxModelessWindows.Append(this);
     }
 
         wxModelessWindows.Append(this);
     }


@@ -113,7 +113,7 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
 
 bool wxDialog::IsModal() const
 {
 
 bool wxDialog::IsModal() const
 {

-    return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+    return m_isModalStyle;

 }
 
 
 }