Clarified wxPropertyGrid::HitTest() docs

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 73b06497558ce54e38181e598e56a75855f7bf0e..d29686af5716165146e052d3e6bd6e14a16c48bb 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -29,12 +29,28 @@ public:
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
+// 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_PROCESS_CALLBACKS
+    #define wxHAS_GUI_SOCKET_MANAGER
+#endif
+
+#ifdef __DARWIN__
+    #define wxHAS_GUI_PROCESS_CALLBACKS
+#endif
+
+class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase

 {
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);
 {
 public:
     virtual wxEventLoopBase *CreateEventLoop();
     virtual int WaitForChild(wxExecuteData& execData);

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifdef wxHAS_GUI_PROCESS_CALLBACKS

     virtual int AddProcessCallback(wxEndProcessData *data, int fd);
 #endif
 #if wxUSE_TIMER
     virtual int AddProcessCallback(wxEndProcessData *data, int fd);
 #endif
 #if wxUSE_TIMER


@@ -64,15 +80,8 @@ public:
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
 

-    // GTK+ and Motif integrate sockets directly in their main loop, the other
-    // Unix ports do it at wxEventLoop level
-    //
-    // 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 wxUSE_SOCKETS && (defined(__WXGTK__) || defined(__WXMOTIF__))
-    virtual GSocketManager *GetSocketManager();
+#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
+    virtual wxSocketManager *GetSocketManager();

 #endif
 };
 
 #endif
 };