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

Avoid conflict with INFINITY of math.h.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-13 19:48:36 +00:00
parent 956615e2f7
commit 699bfc3d1a
1 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/src/fl/toolwnd.cpp
View File

@@ -398,7 +398,7 @@ void wxToolWindow::SetHintCursor( int type )
} }
} }
#define INFINITY 32768 #define FL_INFINITY 32768
static inline void clip_to( int& value, long from, long till ) static inline void clip_to( int& value, long from, long till )
{ {
@@ -470,8 +470,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
left += delta.x; left += delta.x;
top += delta.y; top += delta.y;
clip_to( left, -INFINITY, mInitialRect.x + mInitialRect.width - minDim.x ); clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width - minDim.x );
clip_to( top, -INFINITY, mInitialRect.y + mInitialRect.height - minDim.y ); clip_to( top, -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
} }
else else
if ( mCursorType == HITS_WND_LEFT_EDGE || if ( mCursorType == HITS_WND_LEFT_EDGE ||
@@ -480,8 +480,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
left += delta.x; left += delta.x;
bottom += delta.y; bottom += delta.y;
clip_to( left, -INFINITY, mInitialRect.x + mInitialRect.width - minDim.x ); clip_to( left, -FL_INFINITY, mInitialRect.x + mInitialRect.width - minDim.x );
clip_to( bottom, mInitialRect.y + minDim.y, INFINITY ); clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );
} }
else else
if ( mCursorType == HITS_WND_RIGHT_EDGE || if ( mCursorType == HITS_WND_RIGHT_EDGE ||
@@ -490,8 +490,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
right += delta.x; right += delta.x;
top += delta.y; top += delta.y;
clip_to( right, mInitialRect.x + minDim.x, INFINITY ); clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
clip_to( top, -INFINITY, mInitialRect.y + mInitialRect.height - minDim.y ); clip_to( top, -FL_INFINITY, mInitialRect.y + mInitialRect.height - minDim.y );
} }
else else
if ( mCursorType == HITS_WND_BOTTOM_EDGE || if ( mCursorType == HITS_WND_BOTTOM_EDGE ||
@@ -500,8 +500,8 @@ void wxToolWindow::CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize&
right += delta.x; right += delta.x;
bottom += delta.y; bottom += delta.y;
clip_to( right, mInitialRect.x + minDim.x, INFINITY ); clip_to( right, mInitialRect.x + minDim.x, FL_INFINITY );
clip_to( bottom, mInitialRect.y + minDim.y, INFINITY ); clip_to( bottom, mInitialRect.y + minDim.y, FL_INFINITY );
} }
else else
{ {