From: Guilhem Lavaux Date: Thu, 2 Jul 1998 17:43:02 +0000 (+0000) Subject: * Deleted all ^M X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ca7731b7c89693a5bf60b2e259757ece780f8f1a * 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 index 0000000000..f0e30ba9ad --- /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 fbde5890cc..12a7c6672b 100644 --- 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(wxProcessEvent, wxEvent) #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) diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt index 9e92f8eaa3..771757479a 100644 --- 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)\extended.obj + $(COMMDIR)\extended.obj \ + $(COMMDIR)\process.obj # $(COMMDIR)\wxstrgnu\wxstrgnu.obj \ # $(COMMDIR)\wxstrgnu\wxregex.obj \ @@ -897,6 +898,11 @@ $(COMMDIR)/extended.obj: $*.c $(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$@ diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index 2024eb7752..899eb80eed 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -63,10 +63,6 @@ #endif #include -IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent) -IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler) - - #define wxEXECUTE_WIN_MESSAGE 10000 struct wxExecuteData { @@ -206,22 +202,3 @@ p,i 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) -{ -} - -