Remove taskbar support for now on OS X

[wxWidgets.git] / include / wx / msw / dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 559d1708eee956ab541f6cb7cc94a2e4865e29e5..2a0631bb54881c77cce7188157aaba0a975b0aa1 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -20,7 +20,7 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
-class WXDLLEXPORT wxWindowDisabler;
+class WXDLLEXPORT wxDialogModalData;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
@@ -114,11 +114,12 @@ protected:
     void Init();
 
 private:
-    wxWindow *m_oldFocus;
+    wxWindow*   m_oldFocus;
+    bool        m_endModalCalled; // allow for closing within InitDialog
+
+    // this pointer is non-NULL only while the modal event loop is running
+    wxDialogModalData *m_modalData;
 
-    // while we are showing a modal dialog we disable the other windows using
-    // this object
-    wxWindowDisabler *m_windowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()