X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..2ea6c1f77a260bef70d4a699df6c1d5ad1487f6a:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 13c8c2b59a..2553a5b2bc 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -108,9 +108,7 @@ public: // Windows callbacks WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - // obsolete methods - // ---------------- - +#if WXWIN_COMPATIBILITY_2_6 // use the other ctor wxDEPRECATED( wxDialog(wxWindow *parent, const wxString& title, bool modal, @@ -123,6 +121,10 @@ public: // use IsModal() wxDEPRECATED( bool IsModalShowing() const ); +#endif // WXWIN_COMPATIBILITY_2_6 + + // handle Escape here + virtual bool MSWProcessMessage(WXMSG* pMsg); protected: // find the window to use as parent for this dialog if none has been @@ -142,9 +144,6 @@ protected: // return true if button was "clicked" or false if we don't have it bool EmulateButtonClickIfPresent(int id); - // handle Escape here - virtual bool MSWProcessMessage(WXMSG* pMsg); - private: wxWindow* m_oldFocus; bool m_endModalCalled; // allow for closing within InitDialog