Some doc updates,

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index fbcad04649eec361577d3ff0657006db3a78f199..b8841a57b05ea99f518f425d7bc014dd9d77ed97 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -48,6 +48,9 @@
     #endif // wxUSE_GUI
 #endif // WX_PRECOMP
 
     #endif // wxUSE_GUI
 #endif // WX_PRECOMP
 

+#include "wx/process.h"
+#include "wx/txtstrm.h"
+

 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -75,7 +78,7 @@
 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__

-    #include "windows.h"
+    #include "wx/msw/private.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -949,7 +952,7 @@ int isascii( int c )
 #endif // __MWERKS__
 
 // ----------------------------------------------------------------------------
 #endif // __MWERKS__
 
 // ----------------------------------------------------------------------------

-// misc functions
+// wxSafeYield and supporting functions

 // ----------------------------------------------------------------------------
 
 void wxEnableTopLevelWindows(bool enable)
 // ----------------------------------------------------------------------------
 
 void wxEnableTopLevelWindows(bool enable)


@@ -959,55 +962,100 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(enable);
 }
 
         node->GetData()->Enable(enable);
 }
 

-static void wxFindDisabledWindows(wxWindowList& winDisabled, wxWindow *win)
+wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)

 {
 {

+#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;
     wxWindowList::Node *node;

-    for ( node = win->GetChildren().GetFirst(); node; node = node->GetNext() )
+    for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )

     {
     {

-        wxWindow *child = node->GetData();
-        if ( child->IsEnabled() )
+        wxWindow *winTop = node->GetData();
+        if ( winTop == winToSkip )
+            continue;
+
+        if ( winTop->IsEnabled() )

         {
         {

-            winDisabled.Append(child);
+            winTop->Disable();

         }
         }

+        else
+        {
+            if ( !m_winDisabled )
+            {
+                m_winDisabled = new wxWindowList;
+            }

 
 

-        wxFindDisabledWindows(winDisabled, child);
+            m_winDisabled->Append(winTop);
+        }

     }
 }
 
     }
 }
 

-// Yield to other apps/messages and disable user input to all windows except
-// the given one
-bool wxSafeYield(wxWindow *win)
+wxWindowDisabler::~wxWindowDisabler()

 {
 {

-    // remember all windows we're going to (temporarily) disable
-    wxWindowList winDisabled;
-

     wxWindowList::Node *node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();
     wxWindowList::Node *node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();

-        wxFindDisabledWindows(winDisabled, winTop);
-
-        winTop->Disable();
+        if ( !m_winDisabled || !m_winDisabled->Find(winTop) )
+        {
+            winTop->Enable();
+        }
+        //else: had been already disabled, don't reenable

     }
 
     }
 

-    if ( win )
+    delete m_winDisabled;
+
+#ifdef __WXMSW__
+#ifdef __WIN32__
+    if ( m_winTop )

     {
     {

-        // always enable ourselves
-        win->Enable();
+        if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
+        {
+            wxLogLastError("SetForegroundWindow");
+        }

     }
     }

-
-    bool rc = wxYield();
-
-    // don't call wxEnableTopLevelWindows(TRUE) because this will reenable even
-    // the window which had been disabled before, do it manually instead
-    for ( node = winDisabled.GetFirst(); node; node = node->GetNext() )
+#else
+    if ( m_winTop )

     {
     {

-        node->GetData()->Enable();
+        // 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
+// the given one
+bool wxSafeYield(wxWindow *win)
+{
+    wxWindowDisabler wd;
+
+    bool rc = wxYield();

 
     return rc;
 }
 
 
     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.
 // 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.


@@ -1154,3 +1202,31 @@ wxString wxGetCurrentDir()
 }
 
 #endif // 0
 }
 
 #endif // 0

+
+// ----------------------------------------------------------------------------
+// wxExecute
+// ----------------------------------------------------------------------------
+
+long wxExecute(const wxString& command, wxArrayString& output)
+{
+    // create a wxProcess which will capture the output
+    wxProcess *process = new wxProcess;
+    process->Redirect();
+
+    long rc = wxExecute(command, TRUE /* sync */, process);
+    if ( rc != -1 )
+    {
+        wxInputStream& is = *process->GetInputStream();
+        wxTextInputStream tis(is);
+        while ( !is.Eof() && is.IsOk() )
+        {
+            wxString line = tis.ReadLine();
+            if ( is.LastError() )
+                break;
+
+            output.Add(line);
+        }
+    }
+
+    return rc;
+}