* Deleted all ^M

* Added common/process.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/process.cpp b/src/common/process.cpp
new file mode 100644 (file)
index 0000000..f0e30ba
--- /dev/null
+++ b/src/common/process.cpp
@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        process.cpp
+// Purpose:     Process termination classes
+// Author:      Guilhem Lavaux
+// Modified by:
+// Created:     24/06/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Guilhem Lavaux
+// Licence:    wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "process.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#endif
+
+#include "wx/process.h"
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
+#endif
+
+wxProcess::wxProcess(wxEvtHandler *parent, int id)
+{
+  if (parent)
+    SetPreviousHandler(parent);
+
+  m_id = id;
+}
+
+void wxProcess::OnTerminate(int pid)
+{
+  wxProcessEvent event(m_id, pid);
+
+  ProcessEvent(event);
+}

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index fbde5890ccde224a00195e95fc4dc198436621a8..12a7c6672bb489eae9b2dcd8c7e803f960eaf61f 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -347,12 +347,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)

+IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)

 
 #include "wx/utils.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
 
 
 #include "wx/utils.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
 

+#include "wx/process.h"
+IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
+

 #if USE_TIMEDATE
 #include "wx/date.h"
 IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
 #if USE_TIMEDATE
 #include "wx/date.h"
 IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index 9e92f8eaa345455153b561ef1e770dbcd94fefa8..771757479adbf957aed714fd4e6d40d50b6da5a1 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -108,7 +108,8 @@ COMMONOBJS = \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\wxexpr.obj \
   $(COMMDIR)\y_tab.obj \
   $(COMMDIR)\datstrm.obj \

-  $(COMMDIR)\extended.obj
+  $(COMMDIR)\extended.obj \
+  $(COMMDIR)\process.obj

 
 #  $(COMMDIR)\wxstrgnu\wxstrgnu.obj \
 #  $(COMMDIR)\wxstrgnu\wxregex.obj \
 
 #  $(COMMDIR)\wxstrgnu\wxstrgnu.obj \
 #  $(COMMDIR)\wxstrgnu\wxregex.obj \


@@ -897,6 +898,11 @@ $(COMMDIR)/extended.obj:     $*.c
 $(CPPFLAGS2) /c /Tp $*.c /Fo$@
 <<
 
 $(CPPFLAGS2) /c /Tp $*.c /Fo$@
 <<
 

+$(COMMDIR)/process.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+

 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
         cl @<<
 $(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 2024eb775233c9a31620e40df0c8918024da26f5..899eb80eed306b4b79decc6025cf9d4a99776038 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -63,10 +63,6 @@
 #endif
 #include <stdarg.h>
 
 #endif
 #include <stdarg.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-
-

 #define wxEXECUTE_WIN_MESSAGE 10000
 
 struct wxExecuteData {
 #define wxEXECUTE_WIN_MESSAGE 10000
 
 struct wxExecuteData {


@@ -206,22 +202,3 @@ p,i
   return(instanceID);
 #endif
 }
   return(instanceID);
 #endif
 }

-
-// DUMMIES TO SATISFY THE LINKER UNTIL GUILHEM FINISHES THE CODE
-wxProcess::wxProcess(wxEvtHandler *parent, int id)
-{
-}
-
-wxProcess::~wxProcess()
-{
-}
-
-void wxProcess::OnTerminate(int pid)
-{
-}
-
-wxProcessEvent::wxProcessEvent(int id, int pid)
-{
-}
-  
-