Rotated text patch from Hans-Joachim Baader (with some corrections)

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index bcb9faf6a3958becb4ffa2bf0910876f52b3f6a4..9d778c9d5b67475fa7d9922d1b88a9fc3ffe9eb9 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        utilsexec.cpp
+// Name:        msw/utilsexec.cpp
 // Purpose:     Various utilities
 // Author:      Julian Smart
 // Modified by:
@@ -9,45 +9,51 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
-#pragma implementation
+    #pragma implementation
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/log.h"
-#include "wx/process.h"
 
-#include "wx/msw/private.h"
+#ifdef __WIN32__
+    #include "wx/process.h"
+#endif
 
-#include <windows.h>
+#include "wx/msw/private.h"
 
 #include <ctype.h>
 
 #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
-#include <direct.h>
+    #include <direct.h>
 #ifndef __MWERKS__
-#include <dos.h>
+    #include <dos.h>
 #endif
 #endif
 
-#ifdef __GNUWIN32__
-#ifndef __TWIN32__
-#include <sys/unistd.h>
-#include <sys/stat.h>
-#endif
+#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+    #include <sys/unistd.h>
+    #include <sys/stat.h>
 #endif
 
 #if defined(__WIN32__) && !defined(__WXWINE__)
@@ -68,9 +74,26 @@
 #endif
 #include <stdarg.h>
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
 // this message is sent when the process we're waiting for terminates
 #define wxWM_PROC_TERMINATED (WM_USER + 10000)
 
+// ----------------------------------------------------------------------------
+// this module globals
+// ----------------------------------------------------------------------------
+
+// we need to create a hidden window to receive the process termination
+// notifications and for this we need a (Win) class name for it which we will
+// register the first time it's needed
+static const wxChar *gs_classForHiddenWindow = NULL;
+
+// ----------------------------------------------------------------------------
+// private types
+// ----------------------------------------------------------------------------
+
 // structure describing the process we're being waiting for
 struct wxExecuteData
 {
@@ -93,6 +116,9 @@ public:
     bool       state;         // set to FALSE when the process finishes
 };
 
+// ============================================================================
+// implementation
+// ============================================================================
 
 #ifdef __WIN32__
 static DWORD wxExecuteThread(wxExecuteData *data)
@@ -106,14 +132,13 @@ static DWORD wxExecuteThread(wxExecuteData *data)
     }
 
     wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
-                  "process should have terminated" );
+                  wxT("process should have terminated") );
 
     // send a message indicating process termination to the window
     SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
 
     return 0;
 }
-#endif
 
 // window procedure of a hidden window which is created just to receive
 // the notification message when a process exits
@@ -146,12 +171,11 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
 
     return 0;
 }
-
-extern char wxPanelClassName[];
+#endif
 
 long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 {
-    wxCHECK_MSG( !!command, 0, "empty command in wxExecute" );
+    wxCHECK_MSG( !!command, 0, wxT("empty command in wxExecute") );
 
 #if defined(__WIN32__) && !defined(__TWIN32__)
     // the old code is disabled because we really need a process handle
@@ -211,11 +235,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 #else // 1
     // create the process
     STARTUPINFO si;
-#ifdef __GNUWIN32__
-    memset(&si, 0, sizeof(si));
-#else
-    ::ZeroMemory(&si, sizeof(si));
-#endif
+    wxZeroMemory(si);
 
     si.cb = sizeof(si);
 
@@ -223,7 +243,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 
     if ( ::CreateProcess(
                          NULL,       // application name (use only cmd line)
-                         (char *)command.c_str(),    // full command line
+                         (wxChar *)command.c_str(),  // full command line
                          NULL,       // security attributes: defaults for both
                          NULL,       //   the process and its main thread
                          FALSE,      // don't inherit handles
@@ -243,16 +263,30 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     if ( !::CloseHandle(pi.hThread) )
         wxLogLastError("CloseHandle(hThread)");
 
+    if ( !gs_classForHiddenWindow )
+    {
+        gs_classForHiddenWindow = _T("wxHiddenWindow");
+
+        WNDCLASS wndclass;
+        wxZeroMemory(wndclass);
+        wndclass.lpfnWndProc   = (WNDPROC)wxExecuteWindowCbk;
+        wndclass.hInstance     = wxGetInstance();
+        wndclass.lpszClassName = gs_classForHiddenWindow;
+
+        if ( !::RegisterClass(&wndclass) )
+        {
+            wxLogLastError("RegisterClass(hidden window)");
+
+            return FALSE;
+        }
+    }
+
     // create a hidden window to receive notification about process
     // termination
-    HWND hwnd = ::CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL,
+    HWND hwnd = ::CreateWindow(gs_classForHiddenWindow, NULL,
+                               0, 0, 0, 0, 0, NULL,
                                (HMENU)NULL, wxGetInstance(), 0);
-    wxASSERT_MSG( hwnd, "can't create a hidden window for wxExecute" );
-
-    FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk,
-                                                     wxGetInstance());
-
-    ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance);
+    wxASSERT_MSG( hwnd, wxT("can't create a hidden window for wxExecute") );
 
     // Alloc data
     wxExecuteData *data = new wxExecuteData;
@@ -262,7 +296,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     data->state       = sync;
     if ( sync )
     {
-        wxASSERT_MSG( !handler, "wxProcess param ignored for sync execution" );
+        wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") );
 
         data->handler = NULL;
     }
@@ -317,7 +351,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
         int running;
         do {
             wxYield();
-            running = GetModuleUsage((HANDLE)instanceID);
+            running = GetModuleUsage((HINSTANCE)instanceID);
         } while (running);
     }
 
@@ -338,3 +372,4 @@ long wxExecute(char **argv, bool sync, wxProcess *handler)
 
     return wxExecute(command, sync, handler);
 }
+