X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..33ebfc3b9b542e2cefcab456e47a101311b74697:/include/wx/process.h diff --git a/include/wx/process.h b/include/wx/process.h index 893e1b3874..2089c497ac 100644 --- a/include/wx/process.h +++ b/include/wx/process.h @@ -12,7 +12,7 @@ #ifndef _WX_PROCESSH__ #define _WX_PROCESSH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "process.h" #endif @@ -39,7 +39,7 @@ enum // function will be called when the process terminates. // ---------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxProcess : public wxEvtHandler +class WXDLLIMPEXP_BASE wxProcess : public wxEvtHandler { public: // kill the process with the given PID @@ -136,10 +136,10 @@ protected: // ---------------------------------------------------------------------------- BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EVENT_TYPE(wxEVT_END_PROCESS, 440) + DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, 440) END_DECLARE_EVENT_TYPES() -class WXDLLEXPORT_BASE wxProcessEvent : public wxEvent +class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent { public: wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id) @@ -163,7 +163,7 @@ public: int m_pid, m_exitcode; - DECLARE_DYNAMIC_CLASS(wxProcessEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent) }; typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); @@ -171,9 +171,7 @@ typedef void (wxEvtHandler::*wxProcessEventFunction)(wxProcessEvent&); #define EVT_END_PROCESS(id, func) \ DECLARE_EVENT_TABLE_ENTRY( \ wxEVT_END_PROCESS, id, -1, \ - (wxObjectEventFunction) \ - (wxEventFunction) \ - (wxProcessEventFunction) & func, NULL), + (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxProcessEventFunction, & func ), NULL), #endif // _WX_PROCESSH__