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

more fixes to double to int conversions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-30 23:19:10 +00:00
parent fae47b81e8
commit 8a438f46b5
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/dcgraph.cpp
View File

@@ -786,13 +786,13 @@ void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heig
m_graphicContext->GetTextExtent( str, &w, &h, &d, &e ); m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
if ( height ) if ( height )
*height = h; *height = (wxCoord)h;
if ( descent ) if ( descent )
*descent = d; *descent = (wxCoord)d;
if ( externalLeading ) if ( externalLeading )
*externalLeading =e; *externalLeading = (wxCoord)e;
if ( width ) if ( width )
*width = w; *width = (wxCoord)w;
if ( theFont ) if ( theFont )
{ {

4
src/mac/carbon/dcclient.cpp
View File

@@ -203,8 +203,8 @@ wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
HIViewCreateOffscreenImage( handle, 0, &rect, &image); HIViewCreateOffscreenImage( handle, 0, &rect, &image);
int width = subrect != NULL ? subrect->width : rect.size.width; int width = subrect != NULL ? subrect->width : (int)rect.size.width;
int height = subrect != NULL ? subrect->height : rect.size.height ; int height = subrect != NULL ? subrect->height : (int)rect.size.height ;
bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 ); bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 );

2
src/mac/carbon/font.cpp
View File

@@ -536,7 +536,7 @@ wxSize wxFont::GetPixelSize() const
dc->SetFont(*(wxFont *)this,*wxBLACK); dc->SetFont(*(wxFont *)this,*wxBLACK);
wxDouble width, height = 0; wxDouble width, height = 0;
dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL); dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
return wxSize(width, height); return wxSize((int)width, (int)height);
#else #else
wxFontBase::GetPixelSize(); wxFontBase::GetPixelSize();
#endif #endif