give a name to the enumeration of the values which can be passed to OnDrawItem to...

[wxWidgets.git] / include / wx / unix / apptrait.h

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index fe5639731ad3024b1b0095e0de15a875c9e94b24..8985a93581749c33dc94dcd9e6bcc35217aa20af 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -22,10 +22,6 @@ public:
 #if wxUSE_CONSOLE_EVENTLOOP
     virtual wxEventLoopBase *CreateEventLoop();
 #endif // wxUSE_CONSOLE_EVENTLOOP
-    virtual bool CreateEndProcessPipe(wxExecuteData& execData);
-    virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
-    virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
-    virtual int WaitForChild(wxExecuteData& execData);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -33,14 +29,12 @@ public:
 
 #if wxUSE_GUI
 
-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
+class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
     virtual wxEventLoopBase *CreateEventLoop();
-    virtual bool CreateEndProcessPipe(wxExecuteData& execData);
-    virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
-    virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
+    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
@@ -52,7 +46,7 @@ public:
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
 #if defined(__WXGTK__) && wxUSE_INTL
     virtual void SetLocale();