remove deprecated and constructor and SetModal() methods

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

diff --git a/include/wx/mac/carbon/dialog.h b/include/wx/mac/carbon/dialog.h
index 6b03257503d68c625fdb6258bd0bc4ce34c86b7a..39d3ec0ad0b3d20122627a49c9e125985a7daf8f 100644 (file)
--- a/include/wx/mac/carbon/dialog.h
+++ b/include/wx/mac/carbon/dialog.h
@@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
 public:
     wxDialog() { Init(); }
 
 public:
     wxDialog() { Init(); }
 

-    // Constructor with a modal flag, but no window id - the old convention
-    wxDialog(wxWindow *parent,
-             const wxString& title, bool modal,
-             int x = -1, int y= -1, int width = 500, int height = 500,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        m_isModalStyle = modal;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
-               style, name);
-    }
-

     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,


@@ -75,9 +62,6 @@ public:
     // mac also takes command-period as cancel
     virtual bool IsEscapeKey(const wxKeyEvent& event);
 
     // mac also takes command-period as cancel
     virtual bool IsEscapeKey(const wxKeyEvent& event);
 

-    // returns TRUE if we're in a modal loop
-    bool IsModalShowing() const;
-

     // implementation
     // --------------
 
     // implementation
     // --------------
 

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 50cbb8c5ae8c245da68b0b05b09651bb5d82fb90..7c984cea0c10d8044631223b9fc946145892b80e 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -106,11 +106,6 @@ bool wxDialog::IsModal() const
 }
 
 
 }
 
 

-bool wxDialog::IsModalShowing() const
-{
-    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
-}
-

 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )
 bool wxDialog::Show(bool show)
 {
     if ( !wxDialogBase::Show(show) )