X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49bcad62198be60888dacf02edcbe9278b465fca..f6840be66eb772c08f0cbb43de677509d5d132bb:/include/wx/apptrait.h?ds=sidebyside

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 2d8e282c99..10e4d6b8dc 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -24,13 +24,7 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
-extern "C"
-{
-    struct GSocketGUIFunctionsTable;
-}
-
-// FIXME: Eventually unify Mac OS 9
-class GSocketBSD;
+class GSocketGUIFunctionsTable;
 
 // ----------------------------------------------------------------------------
 // toolkit information
@@ -55,9 +49,14 @@ struct WXDLLIMPEXP_BASE wxToolkitInfo
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_BASE wxStandardPathsBase;
+
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
+    // needed since this class declares virtual members
+    virtual ~wxAppTraitsBase() { }
+
     // hooks for creating the global objects, may be overridden by the user
     // ------------------------------------------------------------------------
 
@@ -81,6 +80,11 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
+#if wxUSE_STDPATHS
+    // wxStandardPaths object is normally the same for wxBase and wxGUI
+    // except in the case of wxMac and wxCocoa
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif // wxUSE_STDPATHS
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
@@ -114,12 +118,13 @@ public:
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
 
 #if wxUSE_SOCKETS
-    // return table of GUI callbacks for GSocket code or NULL in wxBase
+    // return table of GUI callbacks for GSocket code or NULL in wxBase. This
+    // is needed because networking classes are in their own library and so
+    // they can't directly call GUI functions (the same net library can be
+    // used in both GUI and base apps). To complicate it further, GUI library
+    // ("wxCore") doesn't depend on networking library and so only a functions
+    // table can be passed around
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
-
-    // return a new GSocket with the EventLoop_* stuff implemented.
-    // or at least stubbed (i.e. wxBase)
-    virtual GSocketBSD* CreateGSocket() = 0;
 #endif
 
 
@@ -139,7 +144,9 @@ public:
 
 // NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptbase.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
@@ -175,7 +182,6 @@ public:
     virtual wxRendererNative *CreateRenderer();
 #if wxUSE_SOCKETS
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
-    virtual GSocketBSD* CreateGSocket();
 #endif
 
 #ifdef __WXDEBUG__
@@ -206,9 +212,6 @@ public:
     virtual wxRendererNative *CreateRenderer();
 #if wxUSE_SOCKETS
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
-    // return a new GSocket with the EventLoop_* stuff implemented.
-    // TODO: Remove this because each GUI should implement it separately
-    virtual GSocketBSD* CreateGSocket();
 #endif
 
 #ifdef __WXDEBUG__
@@ -226,7 +229,9 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/apptrait.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"
@@ -234,7 +239,7 @@ public:
     #include "wx/mac/apptrait.h"
 #elif defined(__WXPM__)
     #include "wx/os2/apptrait.h"
-#else 
+#else
     // at least, we need an implementation of GetToolkitInfo !
     #if wxUSE_GUI
         class wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -242,7 +247,7 @@ public:
             virtual wxToolkitInfo& GetToolkitInfo();
         };
     #endif // wxUSE_GUI
-    class wxConsoleAppTraits: public wxConsoleAppTraitsBase 
+    class wxConsoleAppTraits: public wxConsoleAppTraitsBase
     {
         virtual wxToolkitInfo& GetToolkitInfo();
     };