Added wxTolBar::etMargins

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

diff --git a/include/wx/process.h b/include/wx/process.h
index 96ce4e5fb95f45e4b80485500c47058b663a9998..94788268cb50b0abcf4464c9970400a5b2844c8a 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PROCESSH__
-#define __PROCESSH__
+#ifndef _WX_PROCESSH__
+#define _WX_PROCESSH__

 
 #ifdef __GNUG__
 #pragma interface "process.h"
 
 #ifdef __GNUG__
 #pragma interface "process.h"


@@ -25,7 +25,7 @@ class WXDLLEXPORT wxProcess: public wxEvtHandler
   DECLARE_DYNAMIC_CLASS(wxProcess)
  public:
 
   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);
   virtual ~wxProcess();
 
   virtual void OnTerminate(int pid);


@@ -52,7 +52,7 @@ class WXDLLEXPORT wxProcessEvent: public wxEvent
 
 typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 
 
 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
 
 #endif

-    // __PROCESSH__
+    // _WX_PROCESSH__