restored (and slightly improved) wxImage::Scale() fix

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 96eac208142a9617afdeb78185bb953590a2aead..91827527d87bf5bf2143dd451be74879028a13a6 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -55,6 +55,17 @@
 
 #include "wx/setup.h"
 
+// old C++ headers (like <iostream.h>) declare classes in the global namespace
+// while the new, standard ones (like <iostream>) do it in std:: namespace
+//
+// using this macro allows constuctions like "wxSTD iostream" to work in
+// either case
+#if !wxUSE_IOSTREAMH
+ #define wxSTD std::
+#else
+ #define wxSTD
+#endif
+
 // just in case they were defined in setup.h
 #ifdef PACKAGE
 #undef PACKAGE
@@ -176,6 +187,9 @@
     #elif defined(__SC__)
         #define __SYMANTECC__
     #endif  // compiler
+
+    // size_t is the same as unsigned int for all Windows compilers we know
+    #define wxSIZE_T_IS_UINT
 #endif  // OS
 
 // if we're on a Unix system but didn't use configure (so that setup.h didn't
@@ -1146,6 +1160,8 @@ enum wxStretch
 #define wxTR_EXTENDED        0x0040
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080
 #define wxTR_NO_LINES        0x0100
+#define wxTR_MAC_BUTTONS     0x0200
+#define wxTR_ROW_LINES       0x0400
 
 /*
  * wxListCtrl flags