make it possible to give focus to the notebook itself (patch 811013)

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 9e13ae773fa3049152c599f84859369aa3f163ea..d28c1544b3a8dc7b80eb78fc7337bb9eca6bf8d0 100644 (file)
--- 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$
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "dialog.h"
 #endif
 
     #pragma interface "dialog.h"
 #endif
 


@@ -20,6 +20,8 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 

+class WXDLLEXPORT wxDialogModalData;
+

 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {


@@ -74,10 +76,11 @@ public:
     // -------------------------------
 
     // override some base class virtuals
     // -------------------------------
 
     // override some base class virtuals

-    virtual bool Show(bool show);
+    virtual bool Show(bool show = TRUE);
+
+    virtual void Raise();

 
     // event handlers
 
     // event handlers

-    bool OnClose();

     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 
     void OnCharHook(wxKeyEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
 


@@ -98,6 +101,12 @@ public:
 #endif // wxUSE_CTL3D
 
 protected:
 #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();
 
     // show modal dialog and enter modal loop
     void DoShowModal();
 


@@ -107,12 +116,13 @@ protected:
 private:
     wxWindow *m_oldFocus;
 
 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_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDialog)

 };
 
 #endif
 };
 
 #endif