X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bd4c6031d438f11af0ec540136f49a928b923c..5c4eb44cbfa4c5f84827cba48cdb9c0cc0c3f7e6:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 83260301ee..0b4174a8d0 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -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 @@ -383,7 +349,7 @@ bool wxDialog::DoOK() wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId()); event.SetEventObject(this); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } #endif // __POCKETPC__