From: Robert Roebling Date: Mon, 22 Oct 2007 09:03:58 +0000 (+0000) Subject: remove deprecated and constructor and SetModal() methods X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/45b81639ef31938fbcf512519dbd74a54fbcd1d5 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 6b03257503..39d3ec0ad0 100644 --- 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(); } - // 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, @@ -75,9 +62,6 @@ public: // 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 // -------------- diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp index 50cbb8c5ae..7c984cea0c 100644 --- 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) )