xcode_config moved

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

diff --git a/include/wx/unix/apptbase.h b/include/wx/unix/apptbase.h
index 3832761d138a441131186c0cb078d826ba49a454..50f30040f8e3cd594cdac5e1a6ef6ce261751384 100644 (file)
--- a/include/wx/unix/apptbase.h
+++ b/include/wx/unix/apptbase.h
@@ -5,21 +5,21 @@
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     23.06.2003
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_APPTBASE_H_
 #define _WX_UNIX_APPTBASE_H_
 

-class wxExecuteData;
+struct wxExecuteData;

 class wxPipe;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code
 // ----------------------------------------------------------------------------
 
 class wxPipe;
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: the Unix version adds extra hooks needed by Unix code
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase

 {
 public:
     // wxExecute() support methods
 {
 public:
     // wxExecute() support methods


@@ -49,14 +49,12 @@ public:
 
     // TODO
 
 
     // TODO
 

-
-    // other miscellaneous helpers
-    // ---------------------------
-
-    // wxGetOsVersion() behaves differently in GUI and non-GUI builds udner
-    // Unix: in the former case it returns the information about the toolkit
-    // and in the latter -- about the OS, so we need to virtualize it
-    virtual int GetOSVersion(int *verMaj, int *verMin) = 0;
+#if wxUSE_SOCKETS
+    // returns the select()-based socket manager for console applications which
+    // is also used by some ports (wxX11, wxDFB) in the GUI build (hence it is
+    // here and not in wxConsoleAppTraits)
+    virtual GSocketManager *GetSocketManager();
+#endif

 };
 
 #endif // _WX_UNIX_APPTBASE_H_
 };
 
 #endif // _WX_UNIX_APPTBASE_H_