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
70 lines
1.9 KiB
C++
70 lines
1.9 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/os2/apptrait.h
|
|
// Purpose: class implementing wxAppTraits for OS/2
|
|
// Author: Stefan Neis
|
|
// Modified by:
|
|
// Created: 22.09.2003
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_OS2_APPTRAIT_H_
|
|
#define _WX_OS2_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
|
|
|
|
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
|
{
|
|
public:
|
|
virtual wxEventLoopBase *CreateEventLoop();
|
|
#if wxUSE_TIMER
|
|
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
|
#endif
|
|
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
|
|
|
|
// wxThread helpers
|
|
// ----------------
|
|
|
|
// Initialize PM facilities to enable GUI access
|
|
virtual void InitializeGui(unsigned long &ulHab);
|
|
|
|
// Clean up message queue.
|
|
virtual void TerminateGui(unsigned long ulHab);
|
|
#ifdef __WXGTK__
|
|
virtual wxString GetDesktopEnvironment() const;
|
|
#endif
|
|
#if wxUSE_SOCKETS
|
|
virtual wxFDIOManager *GetFDIOManager();
|
|
#endif
|
|
};
|
|
|
|
#ifndef __WXPM__
|
|
inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
|
|
{
|
|
}
|
|
|
|
inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif // wxUSE_GUI
|
|
|
|
#endif // _WX_OS2_APPTRAIT_H_
|