Warning fix for wxOS2 night build.

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

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index 38097535f367ac5e23440a7e6df1a89220ed8b51..ef7686fd46eb18a3e764b815c256f33c91fa87ad 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -80,11 +80,11 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
     // 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
     // wxStandardPaths object is normally the same for wxBase and wxGUI
     // except in the case of wxMac and wxCocoa

-#ifndef __WXPALMOS__

     virtual wxStandardPathsBase& GetStandardPaths();
     virtual wxStandardPathsBase& GetStandardPaths();

-#endif
+#endif // wxUSE_STDPATHS

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


@@ -142,11 +142,12 @@ public:
 // include the platform-specific version of the class
 // ----------------------------------------------------------------------------
 
 // 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"
 #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"
     #include "wx/msw/apptbase.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptbase.h"


@@ -229,9 +230,10 @@ public:
 // include the platform-specific version of the classes above
 // ----------------------------------------------------------------------------
 
 // 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"
 #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"
     #include "wx/msw/apptrait.h"
 #elif defined(__UNIX__) && !defined(__EMX__)
     #include "wx/unix/apptrait.h"