X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2158f4d798650d7f8cc59ba36e115679b0effe1b..35bb3cb155917b4287fb2a3841bea22919a3d499:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 8d30e36019..e009c383df 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -27,6 +27,7 @@ #include "wx/dialog.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" #include "wx/utils.h" #include "wx/frame.h" #include "wx/app.h" @@ -41,8 +42,6 @@ #include "wx/evtloop.h" #include "wx/ptr_scpd.h" -#include "wx/msw/wrapcdlg.h" - #if defined(__SMARTPHONE__) && defined(__WXWINCE__) #include "wx/msw/wince/resources.h" #endif // __SMARTPHONE__ && __WXWINCE__ @@ -187,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; @@ -224,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