implementing rollover and pressed image for bitmapbutton on osx_cocoa

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

diff --git a/include/wx/process.h b/include/wx/process.h
index d49f9f9242743e095aeda3436ec21912d71ea3bc..2f1027ae64d76cd3999892e66d4a53b7c97f4014 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -55,7 +55,7 @@ public:
 
 
     // ctors
 
 
     // ctors

-    wxProcess(wxEvtHandler *parent = (wxEvtHandler *) NULL, int nId = wxID_ANY)
+    wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)

         { Init(parent, nId, wxPROCESS_DEFAULT); }
 
     wxProcess(int flags) { Init(NULL, wxID_ANY, flags); }
         { Init(parent, nId, wxPROCESS_DEFAULT); }
 
     wxProcess(int flags) { Init(NULL, wxID_ANY, flags); }


@@ -104,9 +104,14 @@ public:
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 
                         wxInputStream *errStream);
 #endif // wxUSE_STREAMS
 

+    // implementation only - don't use!
+    // --------------------------------
+
+    // needs to be public since it needs to be used from wxExecute() global func
+    void SetPid(long pid) { m_pid = pid; }
+

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

-    void SetPid(long pid) { m_pid = pid; }

 
     int m_id;
     long m_pid;
 
     int m_id;
     long m_pid;


@@ -123,14 +128,16 @@ protected:
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)
     bool m_redirect;
 
     DECLARE_DYNAMIC_CLASS(wxProcess)

-    DECLARE_NO_COPY_CLASS(wxProcess)
+    wxDECLARE_NO_COPY_CLASS(wxProcess);

 };
 
 // ----------------------------------------------------------------------------
 // wxProcess events
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxProcess events
 // ----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_BASE const wxEventType wxEVT_END_PROCESS;
+class WXDLLIMPEXP_FWD_BASE wxProcessEvent;
+
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent );

 
 class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
 {
 
 class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
 {


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

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxProcessEventFunction, &func)
+    wxEVENT_HANDLER_CAST(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))