X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..585266618c27ac77a5e5316c03e06ffc514715c9:/src/msw/dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 23ea6b6d81..889355a4b8 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -96,31 +96,35 @@ END_EVENT_TABLE()
 // wxDialog construction
 // ----------------------------------------------------------------------------
 
-wxDialog::wxDialog()
+void wxDialog::Init()
 {
     m_oldFocus = (wxWindow *)NULL;
+
     m_isShown = FALSE;
 
+    m_windowDisabler = (wxWindowDisabler *)NULL;
+
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
+bool wxDialog::Create(wxWindow *parent,
+                      wxWindowID id,
                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size,
                       long style,
                       const wxString& name)
 {
+    Init();
+
     m_oldFocus = FindFocus();
 
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
     SetName(name);
 
     wxTopLevelWindows.Append(this);
 
-    //  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
-
-    if (parent) parent->AddChild(this);
+    if ( parent )
+        parent->AddChild(this);
 
     if ( id == -1 )
         m_windowId = (int)NewControlId();
@@ -139,8 +143,6 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
-    m_isShown = FALSE;
-
     if (width < 0)
         width = wxDIALOG_DEFAULT_WIDTH;
     if (height < 0)
@@ -153,6 +155,11 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
     if (m_windowStyle & wxSTAY_ON_TOP)
         extendedStyle |= WS_EX_TOPMOST;
 
+#ifndef __WIN16__
+    if (m_exStyle & wxDIALOG_EX_CONTEXTHELP)
+        extendedStyle |= WS_EX_CONTEXTHELP;
+#endif
+
     // Allows creation of dialogs with & without captions under MSWindows,
     // resizeable or not (but a resizeable dialog always has caption -
     // otherwise it would look too strange)
@@ -208,8 +215,7 @@ wxDialog::~wxDialog()
 
     wxTopLevelWindows.DeleteObject(this);
 
-    // this will call BringWindowToTop() if necessary to bring back our parent
-    // window to top
+    // this will also reenable all the other windows for a modal dialog
     Show(FALSE);
 
     if ( !IsModal() )
@@ -338,38 +344,33 @@ void wxDialog::DoShowModal()
     if (oldFocus)
         hwndOldFocus = (HWND) oldFocus->GetHWND();
 
-    // inside this block, all app windows are disabled
+    // remember where the focus was
+    if ( !oldFocus )
     {
-        wxWindowDisabler wd(this);
+        oldFocus = parent;
+        if ( parent )
+            hwndOldFocus = GetHwndOf(parent);
+    }
 
-        // remember where the focus was
-        if ( !oldFocus )
-        {
-            oldFocus = parent;
-            if (parent)
-                hwndOldFocus = (HWND) parent->GetHWND();
-        }
+    // disable all other app windows
+    wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
 
-        // enter the modal loop
-        while ( IsModalShowing() )
-        {
+    m_windowDisabler = new wxWindowDisabler(this);
+
+    // enter the modal loop
+    while ( IsModalShowing() )
+    {
 #if wxUSE_THREADS
-            wxMutexGuiLeaveOrEnter();
+        wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 
-            while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
-                ;
+        while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
+            ;
 
-            // a message came or no more idle processing to do
-            wxTheApp->DoMessage();
-        }
+        // a message came or no more idle processing to do
+        wxTheApp->DoMessage();
     }
 
-#ifdef __WIN32__
-    if ( parent )
-        ::SetActiveWindow(GetHwndOf(parent));
-#endif // __WIN32__
-
     // and restore focus
     // Note that this code MUST NOT access the dialog object's data
     // in case the object has been deleted (which will be the case
@@ -384,16 +385,15 @@ void wxDialog::DoShowModal()
 
 bool wxDialog::Show(bool show)
 {
-    // The following is required when the parent has been disabled, (modal
-    // dialogs, or modeless dialogs with disabling such as wxProgressDialog).
-    // Otherwise the parent disappears behind other windows when the dialog is
-    // hidden.
     if ( !show )
     {
-        wxWindow *parent = GetParent();
-        if ( parent )
+        // if we had disabled other app windows, reenable them back now because
+        // if they stay disabled Windows will activate another window (one
+        // which is enabled, anyhow) and we will lose activation
+        if ( m_windowDisabler )
         {
-            ::BringWindowToTop(GetHwndOf(parent));
+            delete m_windowDisabler;
+            m_windowDisabler = NULL;
         }
     }
 
@@ -422,6 +422,18 @@ bool wxDialog::Show(bool show)
                 {
                     // use it
                     m_parent = parent;
+
+                    // VZ: to make dialog behave properly we should reparent
+                    //     the dialog for Windows as well - unfortunately,
+                    //     following the docs for SetParent() results in this
+                    //     code which plainly doesn't work
+#if 0
+                    long dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+                    dwStyle &= ~WS_POPUP;
+                    dwStyle |= WS_CHILD;
+                    ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyle);
+                    ::SetParent(GetHwnd(), GetHwndOf(parent));
+#endif // 0
                 }
             }
 
@@ -548,6 +560,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 
     switch ( message )
     {
+#if 0 // now that we got owner window right it doesn't seem to be needed
         case WM_ACTIVATE:
             switch ( LOWORD(wParam) )
             {
@@ -574,6 +587,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                     // fall through to process it normally as well
             }
             break;
+#endif // 0
 
         case WM_CLOSE:
             // if we can't close, tell the system that we processed the