X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..51f5e2822cdcb8b433b1d117f186dfd8bb06e240:/include/wx/apptrait.h?ds=sidebyside

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 6ef915d9b1..ef7686fd46 100644
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -54,6 +54,9 @@ 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
     // ------------------------------------------------------------------------
 
@@ -77,11 +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
-#ifndef __WXPALMOS__
     virtual wxStandardPathsBase& GetStandardPaths();
-#endif
+#endif // wxUSE_STDPATHS
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------
@@ -139,11 +142,12 @@ public:
 // include the platform-specific version of the class
 // ----------------------------------------------------------------------------
 
-// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
-//     Unix code (and otherwise __UNIX__ wouldn't be defined)
+// NB:  test for __UNIX__ before __WXMAC__ as under Darwin we want to use the
+//      Unix code (and otherwise __UNIX__ wouldn't be defined)
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
 #if defined(__WXPALMOS__)
     #include "wx/palmos/apptbase.h"
-#elif defined(__WXMSW__)
+#elif defined(__WIN32__)
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"
@@ -226,9 +230,10 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
+// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port
 #if defined(__WXPALMOS__)
     #include "wx/palmos/apptrait.h"
-#elif defined(__WXMSW__)
+#elif defined(__WIN32__)
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"