Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only declare AddProcessCallback for wxMotif and wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-10 10:44:06 +00:00
parent 968f15e262
commit 13d4419b86
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/unix/apptrait.h
View File

@@ -29,11 +29,23 @@ public:
#if wxUSE_GUI #if wxUSE_GUI
// 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_CALLBACKS
#endif
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop();
virtual int WaitForChild(wxExecuteData& execData); virtual int WaitForChild(wxExecuteData& execData);
#ifdef wxHAS_GUI_CALLBACKS
virtual int AddProcessCallback(wxEndProcessData *data, int fd); virtual int AddProcessCallback(wxEndProcessData *data, int fd);
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
@@ -62,14 +74,7 @@ public:
virtual bool ShowAssertDialog(const wxString& msg); virtual bool ShowAssertDialog(const wxString& msg);
#endif #endif
// GTK+ and Motif integrate sockets directly in their main loop, the other #if wxUSE_SOCKETS && defined(wxHAS_GUI_CALLBACKS)
// Unix ports do it at wxEventLoop level
//
// 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 wxUSE_SOCKETS && (defined(__WXGTK__) || defined(__WXMOTIF__))
virtual GSocketManager *GetSocketManager(); virtual GSocketManager *GetSocketManager();
#endif #endif
}; };