X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c9f85ce5aceaa3aedac7e690070d5eff904e5b..355a5e2bd317690c277cd9229af76d7b0db45d03:/include/wx/msw/dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 552f764fc8..d28c1544b3 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dialog.h"
 #endif
 
@@ -20,6 +20,8 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
+class WXDLLEXPORT wxDialogModalData;
+
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
@@ -70,17 +72,15 @@ public:
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
-    // wxMSW only: remove the "Close" button from the dialog
-    bool EnableCloseButton(bool enable = TRUE);
-
     // implementation only from now on
     // -------------------------------
 
     // override some base class virtuals
-    virtual bool Show(bool show);
+    virtual bool Show(bool show = TRUE);
+
+    virtual void Raise();
 
     // event handlers
-    bool OnClose();
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
@@ -101,6 +101,12 @@ public:
 #endif // wxUSE_CTL3D
 
 protected:
+    // 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();
 
@@ -110,12 +116,13 @@ protected:
 private:
     wxWindow *m_oldFocus;
 
-    // while we are showing a modal dialog we disable the other windows using
-    // this object
-    class wxWindowDisabler *m_windowDisabler;
+    // this pointer is non-NULL only while the modal event loop is running
+    wxDialogModalData *m_modalData;
+
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDialog)
 };
 
 #endif