More broken compilers with enum/wxString& ambiguity.

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 164f042bd79f00ed92dbc2ee438bb8fc0ca3a0f2..bfc7e17bb284f5e0b76b7ff4c448af776bc287a6 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     19.06.2003
 // RCS-ID:      $Id$
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -24,6 +24,11 @@ class WXDLLIMPEXP_BASE wxMessageOutput;
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 
 class WXDLLEXPORT wxRendererNative;
 class WXDLLIMPEXP_BASE wxString;
 

+extern "C"
+{
+    struct GSocketGUIFunctionsTable;
+}
+

 // ----------------------------------------------------------------------------
 // toolkit information
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // toolkit information
 // ----------------------------------------------------------------------------


@@ -105,6 +110,16 @@ public:
     // wxBase
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
 
     // wxBase
     virtual void RemoveFromPendingDelete(wxObject *object) = 0;
 

+#if wxUSE_SOCKETS
+    // 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;
+#endif
+

 
     // return information about what toolkit is running; we need for two things
     // that are both contained in wxBase:
 
     // return information about what toolkit is running; we need for two things
     // that are both contained in wxBase:


@@ -124,10 +139,12 @@ public:
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"
 //     Unix code (and otherwise __UNIX__ wouldn't be defined)
 #if defined(__WXMSW__)
     #include "wx/msw/apptbase.h"

-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)

     #include "wx/unix/apptbase.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptbase.h"
     #include "wx/unix/apptbase.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptbase.h"

+#elif defined(__OS2__)
+    #include "wx/os2/apptbase.h"

 #else // no platform-specific methods to add to wxAppTraits
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
 #else // no platform-specific methods to add to wxAppTraits
     // wxAppTraits must be a class because it was forward declared as class
     class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase


@@ -154,6 +171,9 @@ public:
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();

+#if wxUSE_SOCKETS
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif

 
 #ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);
 
 #ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);


@@ -181,6 +201,9 @@ public:
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();
     virtual wxFontMapper *CreateFontMapper();
 #endif // wxUSE_FONTMAP
     virtual wxRendererNative *CreateRenderer();

+#if wxUSE_SOCKETS
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+#endif

 
 #ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);
 
 #ifdef __WXDEBUG__
     virtual bool ShowAssertDialog(const wxString& msg);


@@ -199,15 +222,24 @@ public:
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"
 
 #if defined(__WXMSW__)
     #include "wx/msw/apptrait.h"

-#elif defined(__UNIX__)
+#elif defined(__UNIX__) && !defined(__EMX__)

     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"
     #include "wx/unix/apptrait.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/apptrait.h"

-#else // no platform-specific methods to add to wxAppTraits
+#elif defined(__WXPM__)
+    #include "wx/os2/apptrait.h"
+#else 
+    // at least, we need an implementation of GetToolkitInfo !

     #if wxUSE_GUI
     #if wxUSE_GUI

-        typedef wxGUIAppTraitsBase wxGUIAppTraits;
+        class wxGUIAppTraits : public wxGUIAppTraitsBase
+        {
+            virtual wxToolkitInfo& GetToolkitInfo();
+        };

     #endif // wxUSE_GUI
     #endif // wxUSE_GUI

-    typedef wxConsoleAppTraitsBase wxConsoleAppTraits;
+    class wxConsoleAppTraits: public wxConsoleAppTraitsBase 
+    {
+        virtual wxToolkitInfo& GetToolkitInfo();
+    };

 #endif // platform
 
 #endif // _WX_APPTRAIT_H_
 #endif // platform
 
 #endif // _WX_APPTRAIT_H_