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

GetSocketManager() has no GUI-specific version under Darwin finally

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-04-11 12:59:22 +00:00
parent b2915c82ca
commit a0f4d36895
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,8 +36,13 @@ public:
// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is // 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 // no advantage in doing this compared to the generic way currently used
// by wxX11, should we continue to use GTK/Motif- specific stuff? // by wxX11, should we continue to use GTK/Motif- specific stuff?
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__DARWIN__) #if defined(__WXGTK__) || defined(__WXMOTIF__)
#define wxHAS_GUI_CALLBACKS #define wxHAS_GUI_PROCESS_CALLBACKS
#define wxHAS_GUI_SOCKET_MANAGER
#endif
#ifdef __DARWIN__
#define wxHAS_GUI_SOCKET_MANAGER
#endif #endif
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -45,7 +50,7 @@ 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 #ifdef wxHAS_GUI_PROCESS_CALLBACKS
virtual int AddProcessCallback(wxEndProcessData *data, int fd); virtual int AddProcessCallback(wxEndProcessData *data, int fd);
#endif #endif
#if wxUSE_TIMER #if wxUSE_TIMER
@@ -75,7 +80,7 @@ public:
virtual bool ShowAssertDialog(const wxString& msg); virtual bool ShowAssertDialog(const wxString& msg);
#endif #endif
#if wxUSE_SOCKETS && defined(wxHAS_GUI_CALLBACKS) #if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
virtual GSocketManager *GetSocketManager(); virtual GSocketManager *GetSocketManager();
#endif #endif
}; };