X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf44735628cecb0326b953c4872260f223fc8769..f5419957e5794f2d10f4e125f77b2c2e2cd222d6:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index cd5cf5471b..94788268cb 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -9,11 +9,11 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __PROCESSH__ -#define __PROCESSH__ +#ifndef _WX_PROCESSH__ +#define _WX_PROCESSH__ #ifdef __GNUG__ -#pragma interface +#pragma interface "process.h" #endif #include "wx/defs.h" @@ -25,7 +25,7 @@ class WXDLLEXPORT wxProcess: public wxEvtHandler DECLARE_DYNAMIC_CLASS(wxProcess) public: - wxProcess(wxEvtHandler *parent = NULL, int id = -1); + wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int id = -1); virtual ~wxProcess(); virtual void OnTerminate(int pid); @@ -52,7 +52,7 @@ class WXDLLEXPORT wxProcessEvent: public wxEvent typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&); -#define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL}, +#define EVT_END_PROCESS(id, func) { wxEVT_END_PROCESS, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL}, #endif - // __PROCESSH__ + // _WX_PROCESSH__