define HAVE_LARGEFILE_SUPPORT in setup.h when large files support is available and...

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

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 5ef349070dc127ec9889eb7a3535d9a73d8f6e2e..b8dd8e4abfc12dcdf65e34cae6b62f333feb98fd 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -16,13 +16,12 @@
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 // ----------------------------------------------------------------------------
 
 // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase

 {
 public:
 {
 public:

-    virtual bool CreateEndProcessPipe(wxExecuteData& execData);
-    virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
-    virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
-    virtual int WaitForChild(wxExecuteData& execData);
+#if wxUSE_CONSOLE_EVENTLOOP
+    virtual wxEventLoopBase *CreateEventLoop();
+#endif // wxUSE_CONSOLE_EVENTLOOP

 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif


@@ -30,35 +29,60 @@ 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:
 {
 public:

-    virtual bool CreateEndProcessPipe(wxExecuteData& execData);
-    virtual bool IsWriteFDOfEndProcessPipe(wxExecuteData& execData, int fd);
-    virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
+    virtual wxEventLoopBase *CreateEventLoop();

     virtual int WaitForChild(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);

+#ifdef wxHAS_GUI_PROCESS_CALLBACKS
+    virtual int AddProcessCallback(wxEndProcessData *data, int fd);
+#endif

 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 #endif

+#if wxUSE_THREADS && defined(__WXGTK20__)
+    virtual void MutexGuiEnter();
+    virtual void MutexGuiLeave();
+#endif

 
 

-#if defined(__WXMAC__) || defined(__WXCOCOA__)
+#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS

     virtual wxStandardPathsBase& GetStandardPaths();
 #endif
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif

-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

 
 

-#ifdef __WXGTK__
-
-#if wxUSE_INTL
+#if defined(__WXGTK__) && wxUSE_INTL

     virtual void SetLocale();
     virtual void SetLocale();

-#endif
+#endif // __WXGTK__
+
+#ifdef __WXGTK20__

     virtual wxString GetDesktopEnvironment() const;
     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
                                                wxArrayString& desc) const;
     virtual wxString GetDesktopEnvironment() const;
     virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
                                                wxArrayString& desc) const;

-#endif // __WXGTK__
+#endif // __WXGTK20____

 
 

-#if defined(__WXDEBUG__) && defined(__WXGTK20__)
+#if defined(__WXGTK20__)

     virtual bool ShowAssertDialog(const wxString& msg);
 #endif
     virtual bool ShowAssertDialog(const wxString& msg);
 #endif

+
+#if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER)
+    virtual wxSocketManager *GetSocketManager();
+#endif

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI