X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0a6bb75bcd4b5a4873d766a9208ac6376fe8625..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index f97ed29db0..3a779079b4 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h +// Name: wx/msw/dialog.h // Purpose: wxDialog class // Author: Julian Smart // Modified by: @@ -56,15 +56,7 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr); - ~wxDialog(); - - // override some base class virtuals - virtual bool Destroy(); - virtual bool Show(bool show); - virtual void Iconize(bool iconize); - virtual bool IsIconized() const; - - virtual bool IsTopLevel() const { return TRUE; } + virtual ~wxDialog(); void SetModal(bool flag); virtual bool IsModal() const; @@ -78,13 +70,12 @@ public: // returns TRUE if we're in a modal loop bool IsModalShowing() const; -#if WXWIN_COMPATIBILITY - bool Iconized() const { return IsIconized(); }; -#endif - // implementation only from now on // ------------------------------- + // override some base class virtuals + virtual bool Show(bool show = TRUE); + // event handlers bool OnClose(); void OnCharHook(wxKeyEvent& event); @@ -107,9 +98,11 @@ public: #endif // wxUSE_CTL3D protected: - // override more base class virtuals - virtual void DoSetClientSize(int width, int height); - virtual void DoGetPosition(int *x, int *y) const; + // find the window to use as parent for this dialog if none has been + // specified explicitly by the user + // + // may return NULL + wxWindow *FindSuitableParent() const; // show modal dialog and enter modal loop void DoShowModal();