X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f46f4c86b234d87b9c1db889cc130d2d7d31c306..e3c55eb333d273693ed2aea23da909b33e9e5484:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index bbe72cdf87..81a00606e0 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -63,7 +63,7 @@ public: // ------------------------------- // override some base class virtuals - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); virtual void Raise(); @@ -82,18 +82,13 @@ public: // Windows callbacks WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#if wxUSE_CTL3D - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); -#endif // wxUSE_CTL3D - // obsolete methods // ---------------- // use the other ctor wxDEPRECATED( wxDialog(wxWindow *parent, const wxString& title, bool modal, - int x = -1, int y= -1, int width = 500, int height = 500, + int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr) ); @@ -113,6 +108,9 @@ protected: // common part of all ctors void Init(); + // end either modal or modeless dialog + void EndDialog(int rc); + private: wxWindow* m_oldFocus; bool m_endModalCalled; // allow for closing within InitDialog