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

diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index c1e08230c25a77e6b2975f3ff87b7b85388fedaa..7bf1c6b382ef18381566a9b8a16057992ee2078b 100644 (file)
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -25,21 +25,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)
-    {
-        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,
     // 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);
 
                 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
     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;
     // 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;
     // modal dialog runs its own event loop
     wxEventLoop *m_eventLoop;

+

     // is modal right now?
     bool m_isShowingModal;
 
     // is modal right now?
     bool m_isShowingModal;
 

diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp
index 6b42e73d02c72a13fdaf3bea6cd218871fa235f7..e109f3df1151f7b4a342ca08b852029fc68b4b5c 100644 (file)
--- a/src/univ/dialog.cpp
+++ b/src/univ/dialog.cpp
@@ -166,11 +166,6 @@ bool wxDialog::IsModal() const
     return m_isShowingModal;
 }
 
     return m_isShowingModal;
 }
 

-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
-    wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
-}
-

 int wxDialog::ShowModal()
 {
     if ( IsModal() )
 int wxDialog::ShowModal()
 {
     if ( IsModal() )