added GetHpen() and GetHpenOf()

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 552f764fc809b9d9a9b3038af8cd2f65922cafc4..7073936cc581311f1234dcc9881693ecb6df0de2 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
 {


@@ -33,6 +35,8 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

+        Init();
+

         long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
                style | modalStyle, name);
         long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
                style | modalStyle, name);


@@ -46,7 +50,9 @@ public:
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {
              long style = wxDEFAULT_DIALOG_STYLE,
              const wxString& name = wxDialogNameStr)
     {

-        Create(parent, id, title, pos, size, style, name);
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);

     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     }
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -70,17 +76,15 @@ public:
     // returns TRUE if we're in a modal loop
     bool IsModalShowing() const;
 
     // 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
     // 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
 
     // event handlers

-    bool OnClose();

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


@@ -101,6 +105,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();
 


@@ -108,14 +118,16 @@ protected:
     void Init();
 
 private:
     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
-    class wxWindowDisabler *m_windowDisabler;

 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxDialog)

 };
 
 #endif
 };
 
 #endif