Added wxTolBar::etMargins

[wxWidgets.git] / include / wx / process.h

diff --git a/include/wx/process.h b/include/wx/process.h
index 67677f35d8c2948fa966094395a1baa41d58a32e..94788268cb50b0abcf4464c9970400a5b2844c8a 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.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
     // _WX_PROCESSH__