pointer returned by GetNativeFontInfo() is now const and must not be deleted (replace...

[wxWidgets.git] / src / msw / dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index a6f5482069b47fbca0367e556012291043138733..94cf00190a3113de6269602f49a32cfe8a48f219 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -41,6 +41,7 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 #include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"
 
 #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
@@ -58,13 +59,6 @@
 #define wxDIALOG_DEFAULT_WIDTH 500
 #define wxDIALOG_DEFAULT_HEIGHT 500
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// all modal dialogs currently shown
-static wxWindowList wxModalDialogs;
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -138,6 +132,33 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
     EVT_CLOSE(wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
+// ----------------------------------------------------------------------------
+// wxDialogModalData
+// ----------------------------------------------------------------------------
+
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData
+{
+public:
+    wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }
+
+    void RunLoop()
+    {
+        m_evtLoop.Run();
+    }
+
+    void ExitLoop()
+    {
+        m_evtLoop.Exit();
+    }
+
+private:
+    wxModalEventLoop m_evtLoop;
+};
+
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData);
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -152,7 +173,7 @@ void wxDialog::Init()
 
     m_isShown = FALSE;
 
-    m_windowDisabler = (wxWindowDisabler *)NULL;
+    m_modalData = NULL;
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 }
@@ -247,7 +268,7 @@ bool wxDialog::IsModal() const
 
 bool wxDialog::IsModalShowing() const
 {
-    return wxModalDialogs.Find(wxConstCast(this, wxDialog)) != NULL;
+    return m_modalData != NULL;
 }
 
 wxWindow *wxDialog::FindSuitableParent() const
@@ -277,8 +298,6 @@ void wxDialog::DoShowModal()
     wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
     wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
 
-    wxModalDialogs.Append(this);
-
     wxWindow *parent = GetParent();
 
     wxWindow* oldFocus = m_oldFocus;
@@ -298,22 +317,12 @@ void wxDialog::DoShowModal()
             hwndOldFocus = GetHwndOf(parent);
     }
 
-    // disable all other app windows
-    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
-
-    m_windowDisabler = new wxWindowDisabler(this);
-
-    // before entering the modal loop, reset the "is in OnIdle()" flag (see
-    // comment in app.cpp)
-    extern bool wxIsInOnIdleFlag;
-    bool wasInOnIdle = wxIsInOnIdleFlag;
-    wxIsInOnIdleFlag = FALSE;
-
     // enter the modal loop
-    wxEventLoop evtLoop;
-    evtLoop.Run();
-
-    wxIsInOnIdleFlag = wasInOnIdle;
+    {
+        wxDialogModalDataTiedPtr modalData(&m_modalData,
+                                           new wxDialogModalData(this));
+        modalData->RunLoop();
+    }
 
     // and restore focus
     // Note that this code MUST NOT access the dialog object's data
@@ -329,16 +338,14 @@ void wxDialog::DoShowModal()
 
 bool wxDialog::Show(bool show)
 {
-    if ( !show )
+    if ( !show && m_modalData )
     {
-        // if we had disabled other app windows, reenable them back now because
+        // we need to do this before calling wxDialogBase version because if we
+        // had disabled other app windows, they must be reenabled right now as
         // if they stay disabled Windows will activate another window (one
-        // which is enabled, anyhow) and we will lose activation
-        if ( m_windowDisabler )
-        {
-            delete m_windowDisabler;
-            m_windowDisabler = NULL;
-        }
+        // which is enabled, anyhow) when we're hidden in the base class Show()
+        // and we will lose activation
+        m_modalData->ExitLoop();
     }
 
     // ShowModal() may be called for already shown dialog
@@ -358,32 +365,19 @@ bool wxDialog::Show(bool show)
         //     every time is simpler than keeping a flag
         Layout();
 
-        // usually will result in TransferDataToWindow() being called
+        // this usually will result in TransferDataToWindow() being called
         InitDialog();
     }
 
-    if ( IsModal() )
+    if ( show && IsModal() )
     {
-        if ( show )
+        // modal dialog needs a parent window, so try to find one
+        if ( !GetParent() )
         {
-            // modal dialog needs a parent window, so try to find one
-            if ( !GetParent() )
-            {
-                m_parent = FindSuitableParent();
-            }
-
-            DoShowModal();
+            m_parent = FindSuitableParent();
         }
-        else // end of modal dialog
-        {
-            // this will cause IsModalShowing() return FALSE and our local
-            // message loop will terminate
-            wxModalDialogs.DeleteObject(this);
 
-            // ensure that there is another message for this window so the
-            // ShowModal loop will exit and won't get stuck in GetMessage().
-            ::PostMessage(GetHwnd(), WM_NULL, 0, 0);
-        }
+        DoShowModal();
     }
 
     return TRUE;
@@ -508,7 +502,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             // creates flicker but at least doesn't show garbage on the screen
             rc = wxWindow::MSWWindowProc(message, wParam, lParam);
             processed = TRUE;
-            if ( !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
+            if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
             {
                 ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */);
             }