made GetPage() not virtual because it doesn't need to be virtual and this allows...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 601f6d2ce0a231cc07cc98e7750fffee6b7dd75c..545e5f7a56aef1e504db59d003a56e01f53768da 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -398,14 +398,19 @@
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)

+
+    /* wxOS2 vs. non wxOS2 ports on OS2 platform */
+#    ifndef __WXMOTIF__
+#        ifndef __WXOS2__
+#            define __WXOS2__
+#        endif
+#        ifndef __WXPM__
+#            define __WXPM__
+#        endif
+#    endif
+

 #    if defined(__IBMCPP__)
 #        define __VISAGEAVER__ __IBMCPP__
 #    if defined(__IBMCPP__)
 #        define __VISAGEAVER__ __IBMCPP__

-#    endif
-#    ifndef __WXOS2__
-#        define __WXOS2__
-#    endif
-#    ifndef __WXPM__
-#        define __WXPM__

 #    endif
 
     /* Place other OS/2 compiler environment defines here */
 #    endif
 
     /* Place other OS/2 compiler environment defines here */


@@ -476,6 +481,10 @@
 #    endif
 #endif
 
 #    endif
 #endif
 

+#ifdef __INTEL_COMPILER
+#   define __INTELC__
+#endif
+

 /*
    We get "Large Files (ILP32) not supported in strict ANSI mode." #error
    from HP-UX standard headers when compiling with g++ without this:
 /*
    We get "Large Files (ILP32) not supported in strict ANSI mode." #error
    from HP-UX standard headers when compiling with g++ without this: