wx/math.h integration

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-14 21:10:15 +00:00
parent b713f8919c
commit 463c4d7193
36 changed files with 37 additions and 55 deletions

View File

@@ -39,7 +39,7 @@
#include <gdk/gdkrgb.h> #include <gdk/gdkrgb.h>
#endif // GTK+ 2.0/1.2 #endif // GTK+ 2.0/1.2
#include <math.h> #include "wx/math.h"
extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,

View File

@@ -27,7 +27,7 @@
#include "wx/gtk/win_gtk.h" #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/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>

View File

@@ -22,8 +22,7 @@
#if wxUSE_LIBGNOMEPRINT #if wxUSE_LIBGNOMEPRINT
#include "math.h" #include "wx/math.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/printdlg.h" #include "wx/printdlg.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

View File

@@ -20,9 +20,7 @@
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -19,9 +19,7 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -21,9 +21,7 @@
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -22,9 +22,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -26,7 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> // for fabs #include "wx/math.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>

View File

@@ -56,7 +56,7 @@
#include "wx/thread.h" #include "wx/thread.h"
#endif #endif
#include <math.h> #include "wx/math.h"
#include <ctype.h> #include <ctype.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

View File

@@ -39,7 +39,7 @@
#include <gdk/gdkrgb.h> #include <gdk/gdkrgb.h>
#endif // GTK+ 2.0/1.2 #endif // GTK+ 2.0/1.2
#include <math.h> #include "wx/math.h"
extern void gdk_wx_draw_bitmap (GdkDrawable *drawable, extern void gdk_wx_draw_bitmap (GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,

View File

@@ -27,7 +27,7 @@
#include "wx/gtk/win_gtk.h" #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/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>

View File

@@ -22,8 +22,7 @@
#if wxUSE_LIBGNOMEPRINT #if wxUSE_LIBGNOMEPRINT
#include "math.h" #include "wx/math.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/printdlg.h" #include "wx/printdlg.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

View File

@@ -20,9 +20,7 @@
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -19,9 +19,7 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -21,9 +21,7 @@
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -22,9 +22,7 @@
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
#include "wx/math.h"
#include <math.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -26,7 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> // for fabs #include "wx/math.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>

View File

@@ -56,7 +56,7 @@
#include "wx/thread.h" #include "wx/thread.h"
#endif #endif
#include <math.h> #include "wx/math.h"
#include <ctype.h> #include <ctype.h>
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

View File

@@ -19,7 +19,7 @@
#include "wx/window.h" #include "wx/window.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/settings.h" #include "wx/settings.h"
#include <math.h> #include "wx/math.h"
#include "wx/mac/private.h" #include "wx/mac/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -25,7 +25,7 @@
#include "wx/dcprint.h" #include "wx/dcprint.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include <math.h> #include "wx/math.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#include "wx/mac/private/print.h" #include "wx/mac/private/print.h"

View File

@@ -40,7 +40,7 @@
#else #else
#include <DriverServices.h> #include <DriverServices.h>
#include <Multiprocessing.h> #include <Multiprocessing.h>
#include <math.h> #include "wx/math.h"
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#endif #endif

View File

@@ -40,7 +40,7 @@
#else #else
#include <DriverServices.h> #include <DriverServices.h>
#include <Multiprocessing.h> #include <Multiprocessing.h>
#include <math.h> #include "wx/math.h"
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#endif #endif

View File

@@ -18,7 +18,7 @@
#include "wx/region.h" #include "wx/region.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include <math.h> #include "wx/math.h"
#include "wx/mac/private.h" #include "wx/mac/private.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

View File

@@ -25,7 +25,7 @@
#include "wx/dcprint.h" #include "wx/dcprint.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include <math.h> #include "wx/math.h"
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#include "wx/mac/private/print.h" #include "wx/mac/private/print.h"

View File

@@ -37,7 +37,8 @@
#if wxHAVE_LIB_XPM #if wxHAVE_LIB_XPM
#include <X11/xpm.h> #include <X11/xpm.h>
#endif #endif
#include <math.h>
#include "wx/math.h"
Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap ); Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );

View File

@@ -49,8 +49,7 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/math.h"
#include <math.h>
#ifdef __VMS__ #ifdef __VMS__
#pragma message disable nosimpint #pragma message disable nosimpint

View File

@@ -19,6 +19,7 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/math.h"
#endif #endif
#include "wx/string.h" #include "wx/string.h"
@@ -26,7 +27,6 @@
#include "wx/window.h" #include "wx/window.h"
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include "wx/dcprint.h" #include "wx/dcprint.h"
#include "math.h"
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE

View File

@@ -23,6 +23,7 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/math.h"
#endif #endif
#define INCL_PM #define INCL_PM
@@ -30,7 +31,6 @@
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -18,6 +18,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/math.h"
#endif #endif
#include "wx/fontdlg.h" #include "wx/fontdlg.h"
@@ -29,7 +30,6 @@
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -23,11 +23,11 @@
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/math.h"
#endif #endif
#include "wx/os2/private.h" #include "wx/os2/private.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -40,6 +40,7 @@
#include "wx/frame.h" #include "wx/frame.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/math.h"
#endif #endif
#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__) #if wxUSE_COLOURDLG && !defined(__SMARTPHONE__)
@@ -48,7 +49,6 @@
#include "wx/colordlg.h" #include "wx/colordlg.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -33,6 +33,7 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/window.h" #include "wx/window.h"
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
#include "wx/math.h"
#endif #endif
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
@@ -44,7 +45,6 @@
#endif #endif
#include "wx/dcprint.h" #include "wx/dcprint.h"
#include "math.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxWin macros // wxWin macros

View File

@@ -38,11 +38,11 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/math.h"
#endif #endif
#include "wx/palmos/private.h" #include "wx/palmos/private.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -34,6 +34,7 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/math.h"
#endif #endif
#include "wx/fontdlg.h" #include "wx/fontdlg.h"
@@ -42,7 +43,6 @@
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/log.h" #include "wx/log.h"
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

View File

@@ -41,7 +41,7 @@ bool wxGetImageFromDrawable(GR_DRAW_ID drawable, int srcX, int srcY, int width,
#include "wx/wfstream.h" #include "wx/wfstream.h"
#endif #endif
#endif #endif
#include <math.h> #include "wx/math.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxMask // wxMask

View File

@@ -23,7 +23,7 @@
#include "wx/x11/private.h" #include "wx/x11/private.h"
#include <math.h> #include "wx/math.h"
#if wxUSE_UNICODE #if wxUSE_UNICODE
#include "glib.h" #include "glib.h"