From a562f4fbdee2042c62ecde59a93cde2b88b656f6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 2 Jan 2003 18:39:32 +0000 Subject: [PATCH] removed a couple of obsolete functions from wxDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/dialog.h | 21 +++++---------------- src/univ/dialog.cpp | 5 ----- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index c1e08230c2..7bf1c6b382 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -25,21 +25,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) - { - long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; - Init(); - Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), - style | modalStyle, name); - } - - ~wxDialog(); - // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, const wxString& title, @@ -59,7 +44,9 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - void SetModal(bool flag); + virtual ~wxDialog(); + + // is the dialog in modal state right now? virtual bool IsModal() const; // For now, same as Show(TRUE) but returns return code @@ -90,8 +77,10 @@ private: // while we are showing a modal dialog we disable the other windows using // this object wxWindowDisabler *m_windowDisabler; + // modal dialog runs its own event loop wxEventLoop *m_eventLoop; + // is modal right now? bool m_isShowingModal; diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index 6b42e73d02..e109f3df11 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -166,11 +166,6 @@ bool wxDialog::IsModal() const return m_isShowingModal; } -void wxDialog::SetModal(bool WXUNUSED(flag)) -{ - wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") ); -} - int wxDialog::ShowModal() { if ( IsModal() )