X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..24d2b4f5ba8ceffe55e7520a233ba6b3046aa27e:/include/wx/msw/dialog.h?ds=sidebyside diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 5ff4513ab4..aae10aa23e 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_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(); @@ -93,7 +93,7 @@ public: // 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 +113,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