more fixes to double to int conversions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 4b4461dc3edbaea1e52e09ca3ba9e86359b24dbb..5b173d0aa42804f8727f4972aac92aaf1246fb18 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -786,13 +786,13 @@ void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heig
     m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
 
     if ( height )
-        *height = h;
+        *height = (wxCoord)h;
     if ( descent )
-        *descent = d;
+        *descent = (wxCoord)d;
     if ( externalLeading )
-        *externalLeading =e;
+        *externalLeading = (wxCoord)e;
     if ( width )
-        *width = w;
+        *width = (wxCoord)w;
 
     if ( theFont )
     {

diff --git a/src/mac/carbon/dcclient.cpp b/src/mac/carbon/dcclient.cpp
index bd03115cb5b455720e7972f23b328349a52c0d3e..7023f8cc9f237e3ab49a57e2c7a1e58b9f458e4a 100644 (file)
--- a/src/mac/carbon/dcclient.cpp
+++ b/src/mac/carbon/dcclient.cpp
@@ -135,7 +135,7 @@ wxWindowDC::wxWindowDC(wxWindow *window)
     {
         CGContextSaveGState( cg );
         m_release = true ;
-        // make sure the context is having its origin at the wx-window coordinates of the 
+        // make sure the context is having its origin at the wx-window coordinates of the
         // view (read at the top of window.cpp about the differences)
         if ( window->MacGetLeftBorderSize() != 0 || window->MacGetTopBorderSize() != 0 )
             CGContextTranslateCTM( cg , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
@@ -189,36 +189,36 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
 
 wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
 {
-    ControlRef handle = (ControlRef) m_window->GetHandle(); 
+    ControlRef handle = (ControlRef) m_window->GetHandle();
     if ( !handle )
         return wxNullBitmap;
 
-    HIRect rect;    
+    HIRect rect;
     CGImageRef image;
     CGContextRef context;
     void* data;
-     
+
     size_t bytesPerRow;
-    
+
     HIViewCreateOffscreenImage( handle, 0, &rect, &image);
-    
-    
-    int width = subrect != NULL ? subrect->width : rect.size.width;
-    int height = subrect !=  NULL ? subrect->height : rect.size.height ; 
-    
+
+
+    int width = subrect != NULL ? subrect->width : (int)rect.size.width;
+    int height = subrect !=  NULL ? subrect->height : (int)rect.size.height ;
+
     bytesPerRow = ( ( width * 8 * 4 + 7 ) / 8 );
 
     data = calloc( 1, bytesPerRow * height );
     context = CGBitmapContextCreate( data, width, height, 8, bytesPerRow, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaPremultipliedFirst );
-    
+
     if ( subrect )
         rect = CGRectOffset( rect, -subrect->x, -subrect->y ) ;
     CGContextDrawImage( context, rect, image );
 
-    unsigned char* buffer = (unsigned char*) data;          
+    unsigned char* buffer = (unsigned char*) data;
     wxBitmap bmp = wxBitmap(width, height, 32);
     wxAlphaPixelData pixData(bmp, wxPoint(0,0), wxSize(width, height));
-    
+
     pixData.UseAlpha();
     wxAlphaPixelData::Iterator p(pixData);
     for (int y=0; y<height; y++) {
@@ -229,12 +229,12 @@ wxBitmap wxWindowDC::DoGetAsBitmap(const wxRect *subrect) const
             p.Green() = a; buffer++;
             p.Blue()  = a; buffer++;
             p.Alpha() = a; buffer++;
-            ++p; 
+            ++p;
         }
         p = rowStart;
         p.OffsetY(pixData, 1);
     }
-    
+
     return bmp;
 }
 

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 0a0f8a432205417619c26af5d52b2db0c74bfe7f..0650fe78d91e26ebe89d9cfd794391ad6d5f1c43 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -535,8 +535,8 @@ wxSize wxFont::GetPixelSize() const
     wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);
     dc->SetFont(*(wxFont *)this,*wxBLACK);
     wxDouble width, height = 0;
-    dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL); 
-    return wxSize(width, height);
+    dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
+    return wxSize((int)width, (int)height);
 #else
     wxFontBase::GetPixelSize();
 #endif