AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move wxMulDivInt32 to common math.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-10-24 18:56:33 +00:00
parent d9b30c5a6c
commit 068becf562
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/geometry.h
View File

@ -20,14 +20,6 @@
#include "wx/gdicmn.h"
#include "wx/math.h"
#if defined(__WXMSW__) && !defined(__WXWINCE__)
#define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
#elif defined( __WXMAC__ )
#define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )
#else
#define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
#endif
class WXDLLIMPEXP_BASE wxDataInputStream;
class WXDLLIMPEXP_BASE wxDataOutputStream;

12
include/wx/math.h
View File

@ -1,10 +1,10 @@
/**
* Name: math.h
* Name: wx/math.h
* Purpose: Declarations/definitions of common math functions
* Author: John Labenski and others
* Modified by:
* Created: 02/02/03
* RCS-ID:
* RCS-ID: $Id$
* Copyright: (c) John Labenski
* Licence: wxWindows licence
*/
@ -102,6 +102,14 @@ inline bool wxIsNullDouble(double x) { return wxIsSameDouble(x, 0.); }
#endif /* __cplusplus */
#if defined(__WXMSW__) && !defined(__WXWINCE__)
#define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c )
#elif defined( __WXMAC__ )
#define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) )
#else
#define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c))))
#endif
#if wxUSE_APPLE_IEEE
#ifdef __cplusplus
extern "C" {

2
src/msw/ole/activex.cpp
View File

@ -24,7 +24,7 @@
#endif
#include "wx/dcclient.h"
#include "wx/geometry.h"
#include "wx/math.h"
#include "wx/msw/ole/activex.h"