6bcc1145fe
This fixes linking problems under Unix introduced by recent changes which
fixed previous problems which were due to files not being linked in at all.
In order to provide a clean separation between base, net and core libraries we
now use the same wxSocketManager (wxSocketFDBasedManager), defined in net
library for both console and GUI Unix applications and just use different FD
IO manager for them: the latter can be defined in base and core libraries as
it doesn't involve wxSocketImpl at all, only its base wxFDIOHandler class.
At more detailed level, these changes required:
1. Adding the new wxFDIOManager class.
2. Refactoring the old (and now removed) wxSocketFDIOManager to use the same
code as wxSocketFDIOManager. This involved:
a) Adding handler and direction parameter to RemoveInput().
b) Storing the mask of registered events in wxFDIOHandler itself.
c) Defining wxFDIOManagerUnix which works with wxFDIODispatcher.
3. Changing the traits classes in Unix ports to define GetFDIOManager()
instead of GetSocketManager().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
101 lines
3.1 KiB
C++
101 lines
3.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/unix/apptrait.h
|
|
// Purpose: standard implementations of wxAppTraits for Unix
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 23.06.2003
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_UNIX_APPTRAIT_H_
|
|
#define _WX_UNIX_APPTRAIT_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
|
|
{
|
|
public:
|
|
#if wxUSE_CONSOLE_EVENTLOOP
|
|
virtual wxEventLoopBase *CreateEventLoop();
|
|
#endif // wxUSE_CONSOLE_EVENTLOOP
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
|
#endif
|
|
};
|
|
|
|
#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_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 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__)) && wxUSE_STDPATHS
|
|
virtual wxStandardPaths& GetStandardPaths();
|
|
#endif
|
|
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
|
|
|
|
#if defined(__WXGTK__) && wxUSE_INTL
|
|
virtual void SetLocale();
|
|
#endif // __WXGTK__
|
|
|
|
#ifdef __WXGTK20__
|
|
virtual wxString GetDesktopEnvironment() const;
|
|
virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
|
|
wxArrayString& desc) const;
|
|
#endif // __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
|
|
|
|
#endif // _WX_UNIX_APPTRAIT_H_
|
|
|