wx/math.h integration

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 4950f9508ac3b89b2732a8c8c30892856e02c470..8a73768b7d3a68e103d219be76e93b5d4d6158e3 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -39,7 +39,7 @@
     #include <gdk/gdkrgb.h>
 #endif // GTK+ 2.0/1.2
 
-#include <math.h>
+#include "wx/math.h"
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index cfd61fc9ce59df50825db59add4ef82b38c7db39..7ae955a594b45084acb5ee60ebd700eecb00b222 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/gtk/win_gtk.h"
 
-#include <math.h>               // for floating-point functions
+#include "wx/math.h" // for floating-point functions
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index c761a15e96c85d036c2082e4864d6987dc574db7..9be9ac7d62585bdebc7c0d126b6fa7c3b03c1100 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -22,8 +22,7 @@
 
 #if wxUSE_LIBGNOMEPRINT
 
-#include "math.h"
-
+#include "wx/math.h"
 #include "wx/fontutil.h"
 #include "wx/printdlg.h"
 #include "wx/gtk/private.h"

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index f2d26ced1d242ffbbcb5330de356c95abb482fe1..af054a217cc0f79b21157784e82f4cb4f752411c 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -20,9 +20,7 @@
 #include "wx/scrolbar.h"
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index bcd260ad6eeeb5c596cdec3f70099a5311205d04..740a202322858269c2e47c960ee08517641b3102 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -19,9 +19,7 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 4ac29c9c25293162939e072286cef309c8dc3e65..c11142163ff1a7c8f5043eff5caea3b5d8ae5f95 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -21,9 +21,7 @@
 #if wxUSE_SPINBTN
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 18e8e0dff21043ba40bf6b1bd96044244fd19225..10aa9301389e236a3722bb633aade9d71a5ddf0d 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -22,9 +22,7 @@
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d91d2bf5f18dd18c468d217cd63c5da45e8060cd..3aeaa60599ca1ac1847737a5689c1f65747f1e0c 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
-#include <math.h>               // for fabs
+#include "wx/math.h"
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ad92e20c40923d273995493f0aa86df2af61b507..32fdde9a844903152d9bb1e33f7524153003875d 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -56,7 +56,7 @@
     #include "wx/thread.h"
 #endif
 
-#include <math.h>
+#include "wx/math.h"
 #include <ctype.h>
 
 #include "wx/gtk/private.h"

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 4950f9508ac3b89b2732a8c8c30892856e02c470..8a73768b7d3a68e103d219be76e93b5d4d6158e3 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -39,7 +39,7 @@
     #include <gdk/gdkrgb.h>
 #endif // GTK+ 2.0/1.2
 
-#include <math.h>
+#include "wx/math.h"
 
 extern void gdk_wx_draw_bitmap     (GdkDrawable  *drawable,
                           GdkGC               *gc,

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index cfd61fc9ce59df50825db59add4ef82b38c7db39..7ae955a594b45084acb5ee60ebd700eecb00b222 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/gtk/win_gtk.h"
 
-#include <math.h>               // for floating-point functions
+#include "wx/math.h" // for floating-point functions
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>

diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp
index c761a15e96c85d036c2082e4864d6987dc574db7..9be9ac7d62585bdebc7c0d126b6fa7c3b03c1100 100644 (file)
--- a/src/gtk1/gnome/gprint.cpp
+++ b/src/gtk1/gnome/gprint.cpp
@@ -22,8 +22,7 @@
 
 #if wxUSE_LIBGNOMEPRINT
 
-#include "math.h"
-
+#include "wx/math.h"
 #include "wx/fontutil.h"
 #include "wx/printdlg.h"
 #include "wx/gtk/private.h"

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index f2d26ced1d242ffbbcb5330de356c95abb482fe1..af054a217cc0f79b21157784e82f4cb4f752411c 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -20,9 +20,7 @@
 #include "wx/scrolbar.h"
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index bcd260ad6eeeb5c596cdec3f70099a5311205d04..740a202322858269c2e47c960ee08517641b3102 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -19,9 +19,7 @@
 #if wxUSE_SLIDER
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 4ac29c9c25293162939e072286cef309c8dc3e65..c11142163ff1a7c8f5043eff5caea3b5d8ae5f95 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -21,9 +21,7 @@
 #if wxUSE_SPINBTN
 
 #include "wx/utils.h"
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 18e8e0dff21043ba40bf6b1bd96044244fd19225..10aa9301389e236a3722bb633aade9d71a5ddf0d 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -22,9 +22,7 @@
 #include "wx/utils.h"
 
 #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-
-#include <math.h>
-
+#include "wx/math.h"
 #include "wx/gtk/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index d91d2bf5f18dd18c468d217cd63c5da45e8060cd..3aeaa60599ca1ac1847737a5689c1f65747f1e0c 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
-#include <math.h>               // for fabs
+#include "wx/math.h"
 
 #include "wx/gtk/private.h"
 #include <gdk/gdkkeysyms.h>

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index ad92e20c40923d273995493f0aa86df2af61b507..32fdde9a844903152d9bb1e33f7524153003875d 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -56,7 +56,7 @@
     #include "wx/thread.h"
 #endif
 
-#include <math.h>
+#include "wx/math.h"
 #include <ctype.h>
 
 #include "wx/gtk/private.h"

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index 07d0f431fcecebced5b5408f62c884a19a438595..59657f38f55c78454b7ea1f5ba0a991c18ed0ad0 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -19,7 +19,7 @@
 #include "wx/window.h"
 #include "wx/toplevel.h"
 #include "wx/settings.h"
-#include <math.h>
+#include "wx/math.h"
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/mac/carbon/dcprint.cpp b/src/mac/carbon/dcprint.cpp
index e875cb038765a608a9f1425c0e646392a5435195..85bc4669700038a282ccf5bfd9ee1ba551e37722 100644 (file)
--- a/src/mac/carbon/dcprint.cpp
+++ b/src/mac/carbon/dcprint.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
-#include <math.h>
+#include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 

diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp
index c3711fd1a3c91d82690b4eabb579574ab90ec27e..7eeabfa7a3dd9bed0a188082371efc701c863109 100755 (executable)
--- a/src/mac/carbon/mpthread.cpp
+++ b/src/mac/carbon/mpthread.cpp
@@ -40,7 +40,7 @@
 #else
 #include <DriverServices.h>
 #include <Multiprocessing.h>
-#include <math.h>
+#include "wx/math.h"
 #endif
 #include "wx/mac/uma.h"
 #endif

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 6c477b3685b804d0cbf4714b14c731c60d22fa06..6809af50f6e8f69d7663bfcdd3d92d556e4413b6 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -40,7 +40,7 @@
 #else
 #include <DriverServices.h>
 #include <Multiprocessing.h>
-#include <math.h>
+#include "wx/math.h"
 #endif
 #include "wx/mac/uma.h"
 #endif

diff --git a/src/mac/classic/dcclient.cpp b/src/mac/classic/dcclient.cpp
index f28c6dc576053bc35bf00b85a33f93c7432c2662..2718f6ce9b5abfc78e41e6b9d0a3c9d7abd405c7 100644 (file)
--- a/src/mac/classic/dcclient.cpp
+++ b/src/mac/classic/dcclient.cpp
@@ -18,7 +18,7 @@
 #include "wx/region.h"
 #include "wx/window.h"
 #include "wx/toplevel.h"
-#include <math.h>
+#include "wx/math.h"
 #include "wx/mac/private.h"
 
 //-----------------------------------------------------------------------------

diff --git a/src/mac/classic/dcprint.cpp b/src/mac/classic/dcprint.cpp
index e875cb038765a608a9f1425c0e646392a5435195..85bc4669700038a282ccf5bfd9ee1ba551e37722 100644 (file)
--- a/src/mac/classic/dcprint.cpp
+++ b/src/mac/classic/dcprint.cpp
@@ -25,7 +25,7 @@
 
 #include "wx/dcprint.h"
 #include "wx/msgdlg.h"
-#include <math.h>
+#include "wx/math.h"
 #include "wx/mac/uma.h"
 #include "wx/mac/private/print.h"
 

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index e588d19a87b3f1dad07250c24e31f0af239b4957..d0f70c18c4738ba6be7c7284d78bb5c4b4c963d3 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -37,7 +37,8 @@
 #if wxHAVE_LIB_XPM
     #include <X11/xpm.h>
 #endif
-#include <math.h>
+
+#include "wx/math.h"
 
 Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
 

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 97cfb8a3293a1ba83304b78c3939a1648d605aaf..0b0941a8e70b01bb3621f09f1b7e122a8b9ba13b 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -49,8 +49,7 @@
 #include "wx/app.h"
 #include "wx/image.h"
 #include "wx/log.h"
-
-#include <math.h>
+#include "wx/math.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint

diff --git a/src/os2/dcprint.cpp b/src/os2/dcprint.cpp
index 7497cdee968d3d6d9eacd71d0ee4212254e09daa..fc49df9d0490d6d9178bb05deb6ff565ecd9c029 100644 (file)
--- a/src/os2/dcprint.cpp
+++ b/src/os2/dcprint.cpp
@@ -19,6 +19,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/app.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/string.h"
@@ -26,7 +27,6 @@
 #include "wx/window.h"
 #include "wx/os2/private.h"
 #include "wx/dcprint.h"
-#include "math.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
 

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 0fa360c0d43d82cf2082e92390f90d9ec31a2a59..efaec2a6c9de3b0c033b5892d9dfa19ae9998933 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -23,6 +23,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/math.h"
 #endif
 
 #define INCL_PM
@@ -30,7 +31,6 @@
 
 #include "wx/os2/private.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index c2b6091965909b508023027ee8bda1f6cef0d73e..e6794d8d402a69e0473670c2c53f145ad60f24e6 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -18,6 +18,7 @@
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/fontdlg.h"
@@ -29,7 +30,6 @@
 #include "wx/os2/private.h"
 #include "wx/cmndata.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/os2/msgdlg.cpp b/src/os2/msgdlg.cpp
index 8aaa2313cc60038050d2efa3724d7600bf51844a..740978ee80eea8bc69f20152ff301d5ab212ea7f 100644 (file)
--- a/src/os2/msgdlg.cpp
+++ b/src/os2/msgdlg.cpp
@@ -23,11 +23,11 @@
 #include "wx/dialog.h"
 #include "wx/app.h"
 #include "wx/msgdlg.h"
+#include "wx/math.h"
 #endif
 
 #include "wx/os2/private.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/palmos/colordlg.cpp b/src/palmos/colordlg.cpp
index 9720f463681d76aede2e1d3b9184131c93b7352f..b94f9f76840cded62e631ccd68018f66aa4739de 100644 (file)
--- a/src/palmos/colordlg.cpp
+++ b/src/palmos/colordlg.cpp
@@ -40,6 +40,7 @@
     #include "wx/frame.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
+    #include "wx/math.h"
 #endif
 
 #if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
@@ -48,7 +49,6 @@
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/palmos/dcprint.cpp b/src/palmos/dcprint.cpp
index 6462bbeef52443de375e7245605461abeaee7155..c3be3f4588cfd2605d0a1d315110c8fa1288cc62 100644 (file)
--- a/src/palmos/dcprint.cpp
+++ b/src/palmos/dcprint.cpp
@@ -33,6 +33,7 @@
     #include "wx/log.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
+    #include "wx/math.h"
 #endif
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -44,7 +45,6 @@
 #endif
 
 #include "wx/dcprint.h"
-#include "math.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros

diff --git a/src/palmos/filedlg.cpp b/src/palmos/filedlg.cpp
index 747b6377de0bf0385dcbfba371f265dccad3ae65..c59ee9b1ba505754cd1ef8761c038d7c9fe572bd 100644 (file)
--- a/src/palmos/filedlg.cpp
+++ b/src/palmos/filedlg.cpp
@@ -38,11 +38,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/math.h"
 #endif
 
 #include "wx/palmos/private.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/palmos/fontdlg.cpp b/src/palmos/fontdlg.cpp
index 37f38b4a65374053901469fa088ccfdc4615a9a3..b52747271411fa77a5b0c01f109763602380c136 100644 (file)
--- a/src/palmos/fontdlg.cpp
+++ b/src/palmos/fontdlg.cpp
@@ -34,6 +34,7 @@
     #include "wx/defs.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
+    #include "wx/math.h"
 #endif
 
 #include "wx/fontdlg.h"
@@ -42,7 +43,6 @@
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 10f3bc41e9e7dbbd901a67abeda6b8b8e58591ea..1b5cff4135e484ea5b0353a80fa5a3fdfb917cd6 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -41,7 +41,7 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width,
 #include "wx/wfstream.h"
 #endif
 #endif
-#include <math.h>
+#include "wx/math.h"
 
 //-----------------------------------------------------------------------------
 // wxMask

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 1f7200e9cccb8d98f3bc9d00d565e4ea498e957e..8cbaf34a0dc31cc022ff7751a7f1c4c8c2366c21 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -23,7 +23,7 @@
 
 #include "wx/x11/private.h"
 
-#include <math.h>
+#include "wx/math.h"
 
 #if wxUSE_UNICODE
 #include "glib.h"