made wxListbook events more consistent with wxNotebook ones (patch 1001271)

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

diff --git a/include/wx/process.h b/include/wx/process.h
index 893e1b38741150b2cbd4bbd8462302d87adf92cc..2089c497ac19f075f65144ec41a024bda29fb787 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 
 #ifndef _WX_PROCESSH__
 #define _WX_PROCESSH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "process.h"
 #endif
 
     #pragma interface "process.h"
 #endif
 


@@ -39,7 +39,7 @@ enum
 // function will be called when the process terminates.
 // ----------------------------------------------------------------------------
 
 // 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
 {
 public:
     // kill the process with the given PID


@@ -136,10 +136,10 @@ protected:
 // ----------------------------------------------------------------------------
 
 BEGIN_DECLARE_EVENT_TYPES()
 // ----------------------------------------------------------------------------
 
 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()
 
 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)
 {
 public:
     wxProcessEvent(int id = 0, int pid = 0, int exitcode = 0) : wxEvent(id)


@@ -163,7 +163,7 @@ public:
     int m_pid,
         m_exitcode;
 
     int m_pid,
         m_exitcode;
 

-    DECLARE_DYNAMIC_CLASS(wxProcessEvent)
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxProcessEvent)

 };
 
 typedef void (wxEvtHandler::*wxProcessEventFunction)(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, \
 #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__
 
 #endif
     // _WX_PROCESSH__