no changes, just remove #if'd out code

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 5a11f9c3e5a5fba2e1e1d4b5995a1181398cea10..b8dd8e4abfc12dcdf65e34cae6b62f333feb98fd 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -37,7 +37,12 @@ public:
 //       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
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+    #define wxHAS_GUI_SOCKET_MANAGER
+#endif
+
+#ifdef __DARWIN__
+    #define wxHAS_GUI_PROCESS_CALLBACKS
 #endif
 
 class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -45,7 +50,7 @@ class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
-#ifdef wxHAS_GUI_CALLBACKS
+#ifdef wxHAS_GUI_PROCESS_CALLBACKS
     virtual int AddProcessCallback(wxEndProcessData *data, int fd);
 #endif
 #if wxUSE_TIMER
@@ -71,12 +76,12 @@ 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_CALLBACKS)
-    virtual GSocketManager *GetSocketManager();
+#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
+    virtual wxSocketManager *GetSocketManager();
 #endif
 };