Compilaton fixes.

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 90ed1c507f4343236964e3e9e7cc02561325dffd..8c5390cc5ce90cc695ba1a4ece89686352ebb382 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -5,7 +5,7 @@
 // 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
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -191,7 +191,29 @@ bool wxDialog::IsModal() const
 
 bool wxDialog::IsModalShowing() const
 {
 
 bool wxDialog::IsModalShowing() const
 {

-    return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+    return wxModalDialogs.Find(wxConstCast(this, wxDialog)) != NULL;
+}
+
+wxWindow *wxDialog::FindSuitableParent() const
+{
+    // first try to use the currently active window
+    HWND hwndFg = ::GetForegroundWindow();
+    wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
+                              : NULL;
+    if ( !parent )
+    {
+        // next try the main app window
+        parent = wxTheApp->GetTopWindow();
+    }
+
+    // finally, check if the parent we found is really suitable
+    if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+    {
+        // don't use this one
+        parent = NULL;
+    }
+
+    return parent;

 }
 
 void wxDialog::DoShowModal()
 }
 
 void wxDialog::DoShowModal()


@@ -225,6 +247,12 @@ void wxDialog::DoShowModal()
 
     m_windowDisabler = new wxWindowDisabler(this);
 
 
     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
     while ( IsModalShowing() )
     {
     // enter the modal loop
     while ( IsModalShowing() )
     {


@@ -239,6 +267,8 @@ void wxDialog::DoShowModal()
         wxTheApp->DoMessage();
     }
 
         wxTheApp->DoMessage();
     }
 

+    wxIsInOnIdleFlag = wasInOnIdle;
+

     // 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
     // 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


@@ -274,6 +304,14 @@ bool wxDialog::Show(bool show)
 
     if ( show )
     {
 
     if ( show )
     {

+        // dialogs don't get WM_SIZE message after creation unlike most (all?)
+        // other windows and so could start their life non laid out correctly
+        // if we didn't call Layout() from here
+        //
+        // NB: normally we should call it just the first time but doing it
+        //     every time is simpler than keeping a flag
+        Layout();
+

         // usually will result in TransferDataToWindow() being called
         InitDialog();
     }
         // usually will result in TransferDataToWindow() being called
         InitDialog();
     }


@@ -285,12 +323,7 @@ bool wxDialog::Show(bool 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() )
             {

-                wxWindow *parent = wxTheApp->GetTopWindow();
-                if ( parent && parent != this && parent->IsShown() )
-                {
-                    // use it
-                    m_parent = parent;
-                }
+                m_parent = FindSuitableParent();

             }
 
             DoShowModal();
             }
 
             DoShowModal();


@@ -300,12 +333,21 @@ bool wxDialog::Show(bool show)
             // this will cause IsModalShowing() return FALSE and our local
             // message loop will terminate
             wxModalDialogs.DeleteObject(this);
             // 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);

         }
     }
 
     return TRUE;
 }
 
         }
     }
 
     return TRUE;
 }
 

+void wxDialog::Raise()
+{
+    ::SetForegroundWindow(GetHwnd());
+}
+

 // a special version for Show(TRUE) for modal dialogs which returns return code
 int wxDialog::ShowModal()
 {
 // a special version for Show(TRUE) for modal dialogs which returns return code
 int wxDialog::ShowModal()
 {


@@ -398,14 +440,6 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 // dialog window proc
 // ---------------------------------------------------------------------------
 
 // dialog window proc
 // ---------------------------------------------------------------------------
 

-BOOL CALLBACK wxRefreshChildProc(HWND hwnd, LPARAM WXUNUSED(lParam))
-{
-    ::InvalidateRect(hwnd, NULL, FALSE /* don't erase bg */);
-
-    // continue enumeration
-    return TRUE;
-}
-

 long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     long rc = 0;
 long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     long rc = 0;


@@ -430,7 +464,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             processed = TRUE;
             if ( !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
             {
             processed = TRUE;
             if ( !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
             {

-                ::EnumChildWindows(GetHwnd(), wxRefreshChildProc, 0);
+                ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */);

             }
             break;
 
             }
             break;