Restore text drag-and-drop in wxSTC broken by Scintilla 2 update.

[wxWidgets.git] / include / wx / unix / apptrait.h

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 0161332ce4912cc7e463a8a6d1799f1d36c34b65..d0c5b47bcf8c297302b90050c3a497c80823867e 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -35,14 +35,15 @@ public:
 //
 // 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?
+//       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
-    #define wxHAS_GUI_SOCKET_MANAGER
-#endif
+#endif // ports using wxFDIOManager
 
-#ifdef __DARWIN__
+#if defined(__WXMAC__)
     #define wxHAS_GUI_PROCESS_CALLBACKS
+    #define wxHAS_GUI_SOCKET_MANAGER
 #endif
 
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -62,7 +63,7 @@ public:
 #endif
 
 #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
-    virtual wxStandardPathsBase& GetStandardPaths();
+    virtual wxStandardPaths& GetStandardPaths();
 #endif
     virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
 
@@ -76,13 +77,21 @@ public:
                                                wxArrayString& desc) const;
 #endif // __WXGTK20____
 
-#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+#if defined(__WXGTK20__)
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 
-#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
-    virtual GSocketManager *GetSocketManager();
+#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