X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6c588e1a65704bd5f3707b0e691a957ad43a148..ac7fb818ccdcb697268fe9d0398bffb85d74fade:/include/wx/msw/dialog.h?ds=sidebyside

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index e8eb98da7d..f97ed29db0 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -23,10 +23,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
 public:
-    wxDialog();
+    wxDialog() { Init(); }
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
@@ -116,7 +114,17 @@ protected:
     // show modal dialog and enter modal loop
     void DoShowModal();
 
+    // common part of all ctors
+    void Init();
+
 private:
+    wxWindow *m_oldFocus;
+
+    // while we are showing a modal dialog we disable the other windows using
+    // this object
+    class wxWindowDisabler *m_windowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 };