moved wxDash typedef to gdicmn.h

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 3f62793a9eb1930cd8b1b42371f8619e1ff288ed..b8841a57b05ea99f518f425d7bc014dd9d77ed97 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -78,7 +78,7 @@
 #endif
 
 #ifdef __WXMSW__
-    #include "windows.h"
+    #include "wx/msw/private.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -952,7 +952,7 @@ int isascii( int c )
 #endif // __MWERKS__
 
 // ----------------------------------------------------------------------------
-// misc functions
+// wxSafeYield and supporting functions
 // ----------------------------------------------------------------------------
 
 void wxEnableTopLevelWindows(bool enable)
@@ -962,57 +962,83 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(enable);
 }
 
-static void wxFindDisabledWindows(wxWindowList& winDisabled, wxWindow *win)
-{
-    wxWindowList::Node *node;
-    for ( node = win->GetChildren().GetFirst(); node; node = node->GetNext() )
-    {
-        wxWindow *child = node->GetData();
-        wxFindDisabledWindows(winDisabled, child);
-
-        if ( child->IsEnabled() )
-        {
-            winDisabled.Append(child);
-            child->Disable();
-        }
-    }
-}
-
 wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
 {
-    // remember all windows we're going to (temporarily) disable
-    m_winDisabled = new wxWindowList;
+#ifdef __WXMSW__
+#ifdef __WIN32__
+    // and the top level window too
+    HWND hwndFG = ::GetForegroundWindow();
+    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
+#else
+    HWND hwndFG = ::GetTopWindow();
+    m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
+#endif
+#endif // MSW
+
+    // remember the top level windows which were already disabled, so that we
+    // don't reenable them later
+    m_winDisabled = NULL;
 
     wxWindowList::Node *node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();
+        if ( winTop == winToSkip )
+            continue;
+
         if ( winTop->IsEnabled() )
         {
-            wxFindDisabledWindows(*m_winDisabled, winTop);
-
-            m_winDisabled->Append(winTop);
             winTop->Disable();
         }
-    }
+        else
+        {
+            if ( !m_winDisabled )
+            {
+                m_winDisabled = new wxWindowList;
+            }
 
-    if ( winToSkip && m_winDisabled->Find(winToSkip) )
-    {
-        // always enable ourselves
-        m_winDisabled->DeleteObject(winToSkip);
-        winToSkip->Enable();
+            m_winDisabled->Append(winTop);
+        }
     }
 }
 
 wxWindowDisabler::~wxWindowDisabler()
 {
     wxWindowList::Node *node;
-    for ( node = m_winDisabled->GetFirst(); node; node = node->GetNext() )
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
-        node->GetData()->Enable();
+        wxWindow *winTop = node->GetData();
+        if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+        {
+            winTop->Enable();
+        }
+        //else: had been already disabled, don't reenable
     }
 
     delete m_winDisabled;
+
+#ifdef __WXMSW__
+#ifdef __WIN32__
+    if ( m_winTop )
+    {
+        if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
+        {
+            wxLogLastError("SetForegroundWindow");
+        }
+    }
+#else
+    if ( m_winTop )
+    {
+        // 16-bit SetForegroundWindow() replacement
+        RECT reWin;
+        GetWindowRect(m_winTop, &reWin);
+        SetWindowPos (m_winTop, HWND_TOP,
+                             reWin.left, reWin.top, 
+                             reWin.right - reWin.left, reWin.bottom, 
+                             SWP_SHOWWINDOW);
+    }
+#endif
+#endif // MSW
 }
 
 // Yield to other apps/messages and disable user input to all windows except
@@ -1026,6 +1052,10 @@ bool wxSafeYield(wxWindow *win)
     return rc;
 }
 
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
 // Don't synthesize KeyUp events holding down a key and producing KeyDown
 // events with autorepeat. On by default and always on in wxMSW. wxGTK version
 // in utilsgtk.cpp.
@@ -1188,7 +1218,7 @@ long wxExecute(const wxString& command, wxArrayString& output)
     {
         wxInputStream& is = *process->GetInputStream();
         wxTextInputStream tis(is);
-        while ( !is.Eof() )
+        while ( !is.Eof() && is.IsOk() )
         {
             wxString line = tis.ReadLine();
             if ( is.LastError() )