Commited FRM's stockitem patch (empty stock items).

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

diff --git a/include/wx/process.h b/include/wx/process.h
index baaea3e33025fbaac6d370fc83240340dfae1409..f7071168680ebf16f5dec193b67cc6781e87f0d3 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -12,10 +12,6 @@
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "process.h"
-#endif
-

 #include "wx/event.h"
 
 #if wxUSE_STREAMS
 #include "wx/event.h"
 
 #if wxUSE_STREAMS


@@ -105,11 +101,6 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 

-    // for backwards compatibility only, don't use
-#if WXWIN_COMPATIBILITY_2_2
-    wxDEPRECATED( wxProcess(wxEvtHandler *parent, bool redirect) );
-#endif // WXWIN_COMPATIBILITY_2_2
-

 protected:
     void Init(wxEvtHandler *parent, int id, int flags);
 
 protected:
     void Init(wxEvtHandler *parent, int id, int flags);
 


@@ -168,7 +159,7 @@ public:
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 #define wxProcessEventHandler(func) \
 typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&);
 
 #define wxProcessEventHandler(func) \

-    (wxObjectEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)

 
 #define EVT_END_PROCESS(id, func) \
    wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))
 
 #define EVT_END_PROCESS(id, func) \
    wx__DECLARE_EVT1(wxEVT_END_PROCESS, id, wxProcessEventHandler(func))