Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

excluded geometry.cpp from build by using #if wxUSE_GEOMETRY which is never

Browse Source 
defined to be 1 (so far)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-24 16:22:11 +00:00
parent de2d2cdc86
commit c3a4297caf
2 changed files with 374 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/geometry.h
View File

@@ -9,14 +9,21 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GEOMETRY__ #ifndef _WX_GEOMETRY_H_
#define _WX_GEOMETRY__ #define _WX_GEOMETRY_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface "geometry.h" #pragma interface "geometry.h"
#endif #endif
#include "wx/defs.h" #include "wx/defs.h"
#ifndef wxUSE_GEOMETRY
#define wxUSE_GEOMETRY 0
#endif
#if wxUSE_GEOMETRY
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include <math.h> #include <math.h>
@@ -131,13 +138,6 @@ inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y )
*y = (wxInt32) floor( m_y + 0.5) ; *y = (wxInt32) floor( m_y + 0.5) ;
} }
inline wxDouble wxPoint2DDouble::GetVectorLength() ;
inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) ;
inline wxDouble wxPoint2DDouble::GetVectorAngle() ;
inline void wxPoint2DDouble::SetVectorAngle( wxDouble degrees ) ;
inline void wxPoint2DDouble::SetPolarCoordinates( wxDouble angle , wxDouble length ) ;
inline void wxPoint2DDouble::Normalize() ;
inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt )
{ {
return sqrt( GetDistanceSquare( pt ) ); return sqrt( GetDistanceSquare( pt ) );
@@ -462,7 +462,6 @@ inline void wxPoint2DInt::SetVectorLength( wxDouble length )
m_y = (wxInt32)(m_y * length / before) ; m_y = (wxInt32)(m_y * length / before) ;
} }
inline void wxPoint2DInt::SetPolarCoordinates( wxInt32 angle , wxInt32 length ) ;
inline void wxPoint2DInt::Normalize() inline void wxPoint2DInt::Normalize()
{ {
SetVectorLength( 1 ) ; SetVectorLength( 1 ) ;
@@ -741,4 +740,7 @@ inline wxPoint2DInt wxTransform2D::InverseTransform( const wxPoint2DInt &pt ) co
inline wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const inline wxRect2DInt wxTransform2D::InverseTransform( const wxRect2DInt &r ) const
{ wxRect2DInt res = r ; InverseTransform( &res ) ; return res ; } { wxRect2DInt res = r ; InverseTransform( &res ) ; return res ; }
#endif
#endif // wxUSE_GEOMETRY
#endif // _WX_GEOMETRY_H_

3
src/common/geometry.cpp
View File

@@ -22,6 +22,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_GEOMETRY
#include "wx/log.h" #include "wx/log.h"
#include <string.h> #include <string.h>
@@ -309,3 +311,4 @@ void wxRect2DInt::ReadFrom( wxDataInputStream &stream )
m_height = stream.Read32() ; m_height = stream.Read32() ;
} }
#endif // wxUSE_GEOMETRY