projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove now unused GetSelection from the OSX WebKit backend.
[wxWidgets.git]
/
include
/
wx
/
process.h
diff --git
a/include/wx/process.h
b/include/wx/process.h
index 36e7519bd808c364f09ce756241be82330de3768..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,7
+128,7
@@
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);
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-132,7
+137,7
@@
protected:
class WXDLLIMPEXP_FWD_BASE wxProcessEvent;
class WXDLLIMPEXP_FWD_BASE wxProcessEvent;
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent )
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_BASE, wxEVT_END_PROCESS, wxProcessEvent )
;
class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
{
class WXDLLIMPEXP_BASE wxProcessEvent : public wxEvent
{