From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 24 Aug 2002 16:20:21 +0000 (+0000)
Subject: getting rid of warnings
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b028d57d15c1fc54f3a68c9dca18b5c53a3f755

getting rid of warnings


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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 9c4bc2c8ce..1d0252c810 100644
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -466,10 +466,11 @@ void wxDisplaySize(int *width, int *height)
 
 void wxDisplaySizeMM(int *width, int *height)
 {
-   wxDisplaySize(width, height);
-   // on mac 72 is fixed (at least now ;-)
-   *width *= 25.4 / 72 ;
-   *height *= 25.4 / 72 ;
+    wxDisplaySize(width, height);
+    // on mac 72 is fixed (at least now ;-)
+    float cvPt2Mm = 25.4 / 72;
+    *width = int( *width * cvPt2Mm );
+    *height = int( *height * cvPt2Mm );
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 9c4bc2c8ce..1d0252c810 100644
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -466,10 +466,11 @@ void wxDisplaySize(int *width, int *height)
 
 void wxDisplaySizeMM(int *width, int *height)
 {
-   wxDisplaySize(width, height);
-   // on mac 72 is fixed (at least now ;-)
-   *width *= 25.4 / 72 ;
-   *height *= 25.4 / 72 ;
+    wxDisplaySize(width, height);
+    // on mac 72 is fixed (at least now ;-)
+    float cvPt2Mm = 25.4 / 72;
+    *width = int( *width * cvPt2Mm );
+    *height = int( *height * cvPt2Mm );
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)