corrected control inheritance

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 35630816ebdd1a55e5821c3ea67384633ea11426..d814dfcd49f4e5182a68c7bc1a59b445c8eae816 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -187,8 +187,11 @@
         #define __SYMANTECC__
     #endif  // compiler
 
         #define __SYMANTECC__
     #endif  // compiler
 

-    // size_t is the same as unsigned int for all Windows compilers we know
-    #define wxSIZE_T_IS_UINT
+    // size_t is the same as unsigned int for all Windows compilers we know,
+    // so define it if it hadn't been done by configure yet
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_UINT
+    #endif

 #endif  // OS
 
 // if we're on a Unix system but didn't use configure (so that setup.h didn't
 #endif  // OS
 
 // if we're on a Unix system but didn't use configure (so that setup.h didn't