Added chapter on collection and container classes to contents

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 2ac002dec36b657aa3d378faeba6a93568250149..49c15f328409766841d5ed091a39a822082f497b 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -498,23 +498,32 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                     keyCode = WXK_F1 + n - 1;
                 }
                 else {
                     keyCode = WXK_F1 + n - 1;
                 }
                 else {

-#if 0 // this is not supported by GTK+, apparently

                     // several special cases
                     current.MakeUpper();
                     if ( current == wxT("DEL") ) {
                     // several special cases
                     current.MakeUpper();
                     if ( current == wxT("DEL") ) {

-                        keyCode = VK_DELETE;
+                        keyCode = WXK_DELETE;

                     }
                     }

+                    else if ( current == wxT("DELETE") ) {
+                        keyCode = WXK_DELETE;
+                    }
+                    else if ( current == wxT("INS") ) {
+                        keyCode = WXK_INSERT;
+                    }
+                    else if ( current == wxT("INSERT") ) {
+                        keyCode = WXK_INSERT;
+                    }
+#if 0

                     else if ( current == wxT("PGUP") ) {
                         keyCode = VK_PRIOR;
                     }
                     else if ( current == wxT("PGDN") ) {
                         keyCode = VK_NEXT;
                     }
                     else if ( current == wxT("PGUP") ) {
                         keyCode = VK_PRIOR;
                     }
                     else if ( current == wxT("PGDN") ) {
                         keyCode = VK_NEXT;
                     }

+#endif

                     else
                     else

-#endif // 0

                     {
                     {

-                        wxLogDebug(wxT("Unrecognized accel key '%s', accel "
-                                       "string ignored."), current.c_str());
+                        wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
+                                   current.c_str());

                     }
                 }
             }
                     }
                 }
             }


@@ -878,10 +887,13 @@ int wxMessageBox(const wxString& message, const wxString& caption, long style,
             return wxYES;
         case wxID_NO:
             return wxNO;
             return wxYES;
         case wxID_NO:
             return wxNO;

-        default:

         case wxID_CANCEL:
             return wxCANCEL;
     }
         case wxID_CANCEL:
             return wxCANCEL;
     }

+
+    wxFAIL_MSG( _T("unexpected return code from wxMessageDialog") );
+
+    return wxCANCEL;

 }
 
 #if wxUSE_TEXTDLG
 }
 
 #if wxUSE_TEXTDLG


@@ -1025,7 +1037,7 @@ wxWindowDisabler::~wxWindowDisabler()
     {
         if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
         {
     {
         if ( !::SetForegroundWindow(GetHwndOf(m_winTop)) )
         {

-            wxLogLastError("SetForegroundWindow");
+            wxLogLastError(wxT("SetForegroundWindow"));

         }
     }
 #else
         }
     }
 #else


@@ -1091,14 +1103,13 @@ wxString wxGetEmailAddress()
 {
     wxString email;
 
 {
     wxString email;
 

-    wxString host = wxGetHostName();
+    wxString host = wxGetFullHostName();

     if ( !!host )
     {
         wxString user = wxGetUserId();
         if ( !!user )
         {
     if ( !!host )
     {
         wxString user = wxGetUserId();
         if ( !!user )
         {

-            wxString email(user);
-            email << wxT('@') << host;
+            email << user << wxT('@') << host;

         }
     }
 
         }
     }
 


@@ -1209,31 +1220,89 @@ wxString wxGetCurrentDir()
 // wxExecute
 // ----------------------------------------------------------------------------
 
 // wxExecute
 // ----------------------------------------------------------------------------
 

-long wxExecute(const wxString& command, wxArrayString& output)
+// this is a private function because it hasn't a clean interface: the first
+// array is passed by reference, the second by pointer - instead we have 2
+// public versions of wxExecute() below
+static long wxDoExecuteWithCapture(const wxString& command,
+                                   wxArrayString& output,
+                                   wxArrayString* error)

 {
 #ifdef __WIN16__
     wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
 {
 #ifdef __WIN16__
     wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");

+

     return 0;
     return 0;

-#else
+#else // !Win16

     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();
 
     long rc = wxExecute(command, TRUE /* sync */, process);
     // create a wxProcess which will capture the output
     wxProcess *process = new wxProcess;
     process->Redirect();
 
     long rc = wxExecute(command, TRUE /* sync */, process);

+
+#if wxUSE_STREAMS

     if ( rc != -1 )
     {
     if ( rc != -1 )
     {

-        wxInputStream& is = *process->GetInputStream();
-        wxTextInputStream tis(is);
-        while ( !is.Eof() && is.IsOk() )
+        wxInputStream* is = process->GetInputStream();
+        wxCHECK_MSG( is, -1, _T("if wxExecute() succeded, stream can't be NULL") );
+        wxTextInputStream tis(*is);
+
+        wxTextInputStream *tes = NULL;
+        wxInputStream *es = NULL;
+        if ( error )

         {
         {

-            wxString line = tis.ReadLine();
-            if ( is.LastError() )
-                break;
+            es = process->GetErrorStream();
+
+            wxCHECK_MSG( es, -1, _T("stderr can't be NULL") );
+
+            tes = new wxTextInputStream(*es);
+        }
+
+        bool cont;
+        do
+        {
+            cont = FALSE;

 
 

-            output.Add(line);
+            if ( !is->Eof() && is->IsOk() )
+            {
+                wxString line = tis.ReadLine();
+                if ( is->LastError() )
+                    break;
+
+                cont = TRUE;
+
+                output.Add(line);
+            }
+
+            if ( error && !es->Eof() && es->IsOk() )
+            {
+                wxString line = tes->ReadLine();
+                if ( es->LastError() )
+                    break;
+
+                cont = TRUE;
+
+                error->Add(line);
+            }

         }
         }

+        while ( cont );
+
+        delete tes;

     }
     }

+#endif // wxUSE_STREAMS
+
+    delete process;

 
     return rc;
 
     return rc;

-#endif
+#endif // IO redirection supoprted
+}
+
+long wxExecute(const wxString& command, wxArrayString& output)
+{
+    return wxDoExecuteWithCapture(command, output, NULL);
+}
+
+long wxExecute(const wxString& command,
+               wxArrayString& output,
+               wxArrayString& error)
+{
+    return wxDoExecuteWithCapture(command, output, &error);

 }
 }