Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / os2 / utilsexc.cpp

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f80036e7d413c9217aa7ff3475478ab68831d529..f9f3885e1673fc3ba8472c4a7a32cbb92ec5bc8c 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -26,12 +26,16 @@
 #include "wx/os2/private.h"
 
 #define PURE_32
 #include "wx/os2/private.h"
 
 #define PURE_32

+#ifndef __EMX__

 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>
 #include <upm.h>
 #include <netcons.h>
 #include <netbios.h>

+#endif

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

-#include <direct.h>
+#ifdef __EMX__
+#include <dirent.h>
+#endif

 
 #include <sys/stat.h>
 #include <io.h>
 
 #include <sys/stat.h>
 #include <io.h>


@@ -42,6 +46,7 @@
 #include <errno.h>
 #include <stdarg.h>
 
 #include <errno.h>
 #include <stdarg.h>
 

+

 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 
 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 


@@ -55,7 +60,7 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
 public:
     ~wxExecuteData()
     {

-        cout << "Closing thread: " << endl;
+//         cout << "Closing thread: " << endl;

         DosExit(EXIT_PROCESS, 0);
     }
 
         DosExit(EXIT_PROCESS, 0);
     }
 


@@ -73,7 +78,7 @@ static ULONG wxExecuteThread(
     ULONG                           ulRc;
     PID                             vPidChild;
 
     ULONG                           ulRc;
     PID                             vPidChild;
 

-    cout << "Executing thread: " << endl;
+//     cout << "Executing thread: " << endl;

 
     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
                           ,DCWW_NOWAIT
 
     ulRc = ::DosWaitChild( DCWA_PROCESSTREE
                           ,DCWW_NOWAIT


@@ -135,7 +140,7 @@ long wxExecute(
 {
     if (rCommand.IsEmpty())
     {
 {
     if (rCommand.IsEmpty())
     {

-        cout << "empty command in wxExecute." << endl;
+//         cout << "empty command in wxExecute." << endl;

         return 0;
     }
 
         return 0;
     }
 


@@ -168,7 +173,7 @@ long wxExecute(
         wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
         return 0;
     }
         wxLogSysError(_("Execution of command '%s' failed with error: %ul"), rCommand.c_str(), rc);
         return 0;
     }

-    cout << "Executing: " << rCommand.c_str() << endl;
+//     cout << "Executing: " << rCommand.c_str() << endl;

     // Alloc data
     wxExecuteData*                  pData = new wxExecuteData;
 
     // Alloc data
     wxExecuteData*                  pData = new wxExecuteData;