remove deprecated and constructor and SetModal() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -96,21 +96,6 @@ public:
|
||||
// Windows callbacks
|
||||
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
// use the other ctor
|
||||
wxDEPRECATED( wxDialog(wxWindow *parent,
|
||||
const wxString& title, bool modal,
|
||||
int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500,
|
||||
long style = wxDEFAULT_DIALOG_STYLE,
|
||||
const wxString& name = wxDialogNameStr) );
|
||||
|
||||
// just call Show() or ShowModal()
|
||||
wxDEPRECATED( void SetModal(bool flag) );
|
||||
|
||||
// use IsModal()
|
||||
wxDEPRECATED( bool IsModalShowing() const );
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
protected:
|
||||
// find the window to use as parent for this dialog if none has been
|
||||
// specified explicitly by the user
|
||||
|
@@ -186,31 +186,6 @@ bool wxDialog::Create(wxWindow *parent,
|
||||
return true;
|
||||
}
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
// deprecated ctor
|
||||
wxDialog::wxDialog(wxWindow *parent,
|
||||
const wxString& title,
|
||||
bool WXUNUSED(modal),
|
||||
int x,
|
||||
int y,
|
||||
int w,
|
||||
int h,
|
||||
long style,
|
||||
const wxString& name)
|
||||
{
|
||||
Init();
|
||||
|
||||
Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
|
||||
}
|
||||
|
||||
void wxDialog::SetModal(bool WXUNUSED(flag))
|
||||
{
|
||||
// nothing to do, obsolete method
|
||||
}
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
wxDialog::~wxDialog()
|
||||
{
|
||||
m_isBeingDeleted = true;
|
||||
@@ -223,15 +198,6 @@ wxDialog::~wxDialog()
|
||||
// showing the dialogs
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
bool wxDialog::IsModalShowing() const
|
||||
{
|
||||
return IsModal();
|
||||
}
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
wxWindow *wxDialog::FindSuitableParent() const
|
||||
{
|
||||
// first try to use the currently active window
|
||||
|
Reference in New Issue
Block a user