remove deprecated and constructor and SetModal() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,19 +26,6 @@ class WXDLLEXPORT wxDialog : public wxDialogBase
|
|||||||
public:
|
public:
|
||||||
wxDialog() { Init(); }
|
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.
|
// Constructor with no modal flag - the new convention.
|
||||||
wxDialog(wxWindow *parent, wxWindowID id,
|
wxDialog(wxWindow *parent, wxWindowID id,
|
||||||
const wxString& title,
|
const wxString& title,
|
||||||
@@ -75,9 +62,6 @@ public:
|
|||||||
// mac also takes command-period as cancel
|
// mac also takes command-period as cancel
|
||||||
virtual bool IsEscapeKey(const wxKeyEvent& event);
|
virtual bool IsEscapeKey(const wxKeyEvent& event);
|
||||||
|
|
||||||
// returns TRUE if we're in a modal loop
|
|
||||||
bool IsModalShowing() const;
|
|
||||||
|
|
||||||
// implementation
|
// implementation
|
||||||
// --------------
|
// --------------
|
||||||
|
|
||||||
|
@@ -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)
|
bool wxDialog::Show(bool show)
|
||||||
{
|
{
|
||||||
if ( !wxDialogBase::Show(show) )
|
if ( !wxDialogBase::Show(show) )
|
||||||
|
Reference in New Issue
Block a user