added text style support to wxTextCtrl for MSW

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

diff --git a/include/wx/geometry.h b/include/wx/geometry.h
index 47c083420a98c4f80894f82dbd353fad9ff6a184..7bc7f527eb6af9ced835c25b121079bc624da011 100644 (file)
--- a/include/wx/geometry.h
+++ b/include/wx/geometry.h
@@ -18,6 +18,10 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#ifndef wxUSE_GEOMETRY
+    #define wxUSE_GEOMETRY 0
+#endif
+

 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"
 #if wxUSE_GEOMETRY
 
 #include "wx/utils.h"


@@ -27,7 +31,11 @@
 #ifdef __WXMSW__
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #elif defined( __WXMAC__ )
 #ifdef __WXMSW__
     #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
 #elif defined( __WXMAC__ )

+    #ifdef __WXMAC_X__
+    #include <CoreServices/CoreServices.h>
+    #else

     #include "Math64.h"
     #include "Math64.h"

+    #endif

     #define wxMulDivInt32( a , b , c ) S32Set( S64Div( S64Multiply( S64Set(a) , S64Set(b) ) , S64Set(c) ) )
 #else
     #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
     #define wxMulDivInt32( a , b , c ) S32Set( S64Div( S64Multiply( S64Set(a) , S64Set(b) ) , S64Set(c) ) )
 #else
     #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))