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

use wxIsSameDouble() and wxIsNullDouble() for warning-less double comparison of doubles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 23:27:27 +00:00
parent f1afd2e066
commit c77a67962c
14 changed files with 139 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/dcbase.cpp
View File

@@ -25,6 +25,7 @@
#endif
#include "wx/dc.h"
#include "wx/math.h"
// bool wxDCBase::sm_cacheing = false;
@@ -401,15 +402,14 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
{
int totalWidth = 0;
size_t i, len = text.Length();
const size_t len = text.Length();
widths.Empty();
widths.Add(0, len);
int w, h;
// reset the cache if font or horizontal scale have changed
if (!s_fontWidthCache.m_widths ||
(s_fontWidthCache.m_scaleX != m_scaleX) ||
(s_fontWidthCache.m_font != GetFont()))
if ( !s_fontWidthCache.m_widths ||
!wxIsSameDouble(s_fontWidthCache.m_scaleX, m_scaleX) ||
(s_fontWidthCache.m_font != GetFont()) )
{
s_fontWidthCache.Reset();
s_fontWidthCache.m_font = GetFont();
@@ -418,7 +418,8 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
// Calculate the position of each character based on the widths of
// the previous characters
for (i=0; i<len; i++)
int w, h;
for ( size_t i = 0; i < len; i++ )
{
const wxChar c = text[i];
unsigned int c_int = (unsigned int)c;