// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
{
public:
- virtual bool CreateEndProcessPipe(wxExecuteData& execData);
- virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
- virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
- virtual int WaitForChild(wxExecuteData& execData);
+#if wxUSE_CONSOLE_EVENTLOOP
+ virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP
+#if wxUSE_TIMER
+ virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
};
#if wxUSE_GUI
-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
+// GTK+ and Motif integrate sockets and child processes monitoring directly in
+// their main loop, the other Unix ports do it at wxEventLoop level and so use
+// the non-GUI traits and don't need anything here
+//
+// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
+// no advantage in doing this compared to the generic way currently used
+// by wxX11, should we continue to use GTK/Motif-specific stuff?
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+ #define wxHAS_GUI_FDIOMANAGER
+ #define wxHAS_GUI_PROCESS_CALLBACKS
+#endif // ports using wxFDIOManager
+
+#if defined(__WXMAC__)
+ #define wxHAS_GUI_PROCESS_CALLBACKS
+ #define wxHAS_GUI_SOCKET_MANAGER
+#endif
+
+class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{
public:
- virtual bool CreateEndProcessPipe(wxExecuteData& execData);
- virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
- virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
+ virtual wxEventLoopBase *CreateEventLoop();
virtual int WaitForChild(wxExecuteData& execData);
+#ifdef wxHAS_GUI_PROCESS_CALLBACKS
+ virtual int AddProcessCallback(wxEndProcessData *data, int fd);
+#endif
+#if wxUSE_TIMER
+ virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
+#endif
+#if wxUSE_THREADS && defined(__WXGTK20__)
+ virtual void MutexGuiEnter();
+ virtual void MutexGuiLeave();
+#endif
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
- virtual wxStandardPathsBase& GetStandardPaths();
+#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
+ virtual wxStandardPaths& GetStandardPaths();
#endif
- virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+ virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-#ifdef __WXGTK__
+#if defined(__WXGTK__) && wxUSE_INTL
virtual void SetLocale();
+#endif // __WXGTK__
+
+#ifdef __WXGTK20__
virtual wxString GetDesktopEnvironment() const;
-#endif
+ virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
+ wxArrayString& desc) const;
+#endif // __WXGTK20____
-#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+#if defined(__WXGTK20__)
virtual bool ShowAssertDialog(const wxString& msg);
#endif
+
+#if wxUSE_SOCKETS
+
+#ifdef wxHAS_GUI_SOCKET_MANAGER
+ virtual wxSocketManager *GetSocketManager();
+#endif
+
+#ifdef wxHAS_GUI_FDIOMANAGER
+ virtual wxFDIOManager *GetFDIOManager();
+#endif
+
+#endif // wxUSE_SOCKETS
};
#endif // wxUSE_GUI