added ctor for wxChar/WCharBuffer from wxCStrData in ANSI/Unicode build to make it...

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 1de2cfea7d464f58267a4fbd8398cb9575a73887..c2ad503e726caf3df087aeec8b0abe5389c10b4c 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -40,7 +40,7 @@ public:
     // needed since this class declares virtual members
     virtual ~wxAppTraitsBase() { }
 
     // needed since this class declares virtual members
     virtual ~wxAppTraitsBase() { }
 

-    // hooks for creating the global objects, may be overridden by the user
+    // hooks for working with the global objects, may be overridden by the user

     // ------------------------------------------------------------------------
 
 #if wxUSE_LOG
     // ------------------------------------------------------------------------
 
 #if wxUSE_LOG


@@ -69,6 +69,13 @@ public:
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif // wxUSE_STDPATHS
 
     virtual wxStandardPathsBase& GetStandardPaths();
 #endif // wxUSE_STDPATHS
 

+#if wxUSE_INTL
+    // called during wxApp initialization to set the locale to correspond to
+    // the user default (i.e. system locale under Windows, LC_ALL under Unix)
+    virtual void SetLocale();
+#endif // wxUSE_INTL
+
+

     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
 


@@ -110,13 +117,28 @@ public:
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 
     virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0;
 #endif
 

-    // return information about the (native) toolkit currently used;
+
+    // functions returning port-specific information
+    // ------------------------------------------------------------------------
+
+    // return information about the (native) toolkit currently used and its
+    // runtime (not compile-time) version.

     // returns wxPORT_BASE for console applications and one of the remaining
     // wxPORT_* values for GUI applications.
     virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;
 
     // return true if the port is using wxUniversal for the GUI, false if not
     virtual bool IsUsingUniversalWidgets() const = 0;
     // returns wxPORT_BASE for console applications and one of the remaining
     // wxPORT_* values for GUI applications.
     virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0;
 
     // return true if the port is using wxUniversal for the GUI, false if not
     virtual bool IsUsingUniversalWidgets() const = 0;

+
+    // return the name of the Desktop Environment such as
+    // "KDE" or "GNOME". May return an empty string.
+    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
+
+protected:
+#if wxUSE_STACKWALKER && defined( __WXDEBUG__ )
+    // utility function: returns the stack frame as a plain wxString
+    virtual wxString GetAssertStackTrace();
+#endif

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


@@ -238,12 +260,12 @@ public:
     #include "wx/palmos/apptrait.h"
 #elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"
     #include "wx/palmos/apptrait.h"
 #elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"

-#elif defined(__UNIX__) && !defined(__EMX__)
+#elif defined(__OS2__)
+    #include "wx/os2/apptrait.h"
+#elif defined(__UNIX__)

     #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"

-#elif defined(__WXPM__)
-    #include "wx/os2/apptrait.h"

 #elif defined(__DOS__)
     #include "wx/msdos/apptrait.h"
 #else
 #elif defined(__DOS__)
     #include "wx/msdos/apptrait.h"
 #else