Cleaned up the API for class/structure/function names to follow the wxWindows convent...

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 7a971cb5ac3e85c08e787005e42f5c99607031e3..5fee1a66cac06491aed66016eee211c9a9877d4d 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -48,8 +48,10 @@
     #endif // wxUSE_GUI
 #endif // WX_PRECOMP
 
     #endif // wxUSE_GUI
 #endif // WX_PRECOMP
 

+#ifndef __WIN16__

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

+#endif

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


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

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

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


@@ -962,65 +964,57 @@ void wxEnableTopLevelWindows(bool enable)
         node->GetData()->Enable(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)
 {
 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
 #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();
+    HWND hwndFG = ::GetTopWindow(0);

     m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
 #endif
 #endif // MSW
 
     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();
     wxWindowList::Node *node;
     for ( node = wxTopLevelWindows.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *winTop = node->GetData();

+        if ( winTop == winToSkip )
+            continue;
+

         if ( winTop->IsEnabled() )
         {
         if ( winTop->IsEnabled() )
         {

-            wxFindDisabledWindows(*m_winDisabled, winTop);
-
-            m_winDisabled->Append(winTop);

             winTop->Disable();
         }
             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;
     }
 }
 
 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;
     }
 
     delete m_winDisabled;


@@ -1039,8 +1033,8 @@ wxWindowDisabler::~wxWindowDisabler()
     {
         // 16-bit SetForegroundWindow() replacement
         RECT reWin;
     {
         // 16-bit SetForegroundWindow() replacement
         RECT reWin;

-        GetWindowRect(m_winTop, &reWin);
-        SetWindowPos (m_winTop, HWND_TOP,
+        GetWindowRect((HWND) m_winTop, &reWin);
+        SetWindowPos ((HWND) m_winTop, HWND_TOP,

                              reWin.left, reWin.top, 
                              reWin.right - reWin.left, reWin.bottom, 
                              SWP_SHOWWINDOW);
                              reWin.left, reWin.top, 
                              reWin.right - reWin.left, reWin.bottom, 
                              SWP_SHOWWINDOW);


@@ -1060,6 +1054,10 @@ bool wxSafeYield(wxWindow *win)
     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.


@@ -1213,6 +1211,10 @@ wxString wxGetCurrentDir()
 
 long wxExecute(const wxString& command, wxArrayString& output)
 {
 
 long wxExecute(const wxString& command, wxArrayString& output)
 {

+#ifdef __WIN16__
+    wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
+    return 0;
+#else

     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();
     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();


@@ -1233,4 +1235,5 @@ long wxExecute(const wxString& command, wxArrayString& output)
     }
 
     return rc;
     }
 
     return rc;

+#endif

 }
 }