Works a little better when you remember to say "virtual"

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 0a169af8f0446b8a34f4395e4fa06fffbe8b07ec..1f3e30f3b7976d7c39715d59bf2ac94dd2d8dad3 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -12,15 +12,41 @@
 #ifndef _WX_APPTRAIT_H_
 #define _WX_APPTRAIT_H_
 
 #ifndef _WX_APPTRAIT_H_
 #define _WX_APPTRAIT_H_
 

-class WXDLLEXPORT wxObject;
+#include "wx/string.h"
+
+class WXDLLIMPEXP_BASE wxObject;

 class WXDLLEXPORT wxAppTraits;
 #if wxUSE_FONTMAP
     class WXDLLEXPORT wxFontMapper;
 #endif // wxUSE_FONTMAP
 class WXDLLEXPORT wxAppTraits;
 #if wxUSE_FONTMAP
     class WXDLLEXPORT wxFontMapper;
 #endif // wxUSE_FONTMAP

-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxMessageOutput;
+class WXDLLIMPEXP_BASE wxLog;
+class WXDLLIMPEXP_BASE wxMessageOutput;

 class WXDLLEXPORT wxRendererNative;
 class WXDLLEXPORT wxRendererNative;

-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_BASE wxString;
+
+extern "C"
+{
+    struct GSocketGUIFunctionsTable;
+}
+
+// ----------------------------------------------------------------------------
+// toolkit information
+// ----------------------------------------------------------------------------
+
+// Information about the toolkit that the app is running under (e.g. wxMSW):
+struct WXDLLIMPEXP_BASE wxToolkitInfo
+{
+    // Short name of the toolkit (e.g. "msw" or "mswuniv"); empty for console:
+    wxString shortName;
+    // Descriptive name of the toolkit, human readable (e.g. "wxMSW" or
+    // "wxMSW/Universal"); "wxBase" for console apps:
+    wxString name;
+    // Version of the underlying toolkit or of the OS for console apps:
+    int versionMajor, versionMinor;
+    // OS mnenomics, e.g. wxGTK or wxMSW:
+    int os;
+};
+

 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp
 
 // ----------------------------------------------------------------------------
 // wxAppTraits: this class defines various configurable aspects of wxApp


@@ -84,14 +110,20 @@ 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
+    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
+#endif

 
 

-    // other miscellaneous helpers
-    // ---------------------------

 
 

-    // wxGetOsVersion() behaves differently in GUI and non-GUI builds under
-    // 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;
+    // return information about what toolkit is running; we need for two things
+    // that are both contained in wxBase:
+    //  - wxGetOsVersion() behaves differently in GUI and non-GUI builds under
+    //    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
+    //  - wxDynamicLibrary::CanonicalizePluginName() must embed toolkit
+    //    signature in DLL name
+    virtual wxToolkitInfo& GetToolkitInfo() = 0;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -102,7 +134,7 @@ 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"


@@ -132,6 +164,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);


@@ -159,6 +194,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);


@@ -177,15 +215,22 @@ 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
+#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_