wxFileDialog cleanup, extracted common code to fldlgcmn.cpp (patch 754187)

[wxWidgets.git] / src / msw / dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 06fbd633bb04cfea2780ea22261144a27ca9997e..8caa96a2e7df9b950a12eac3346d7e5de65b9a66 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1615,8 +1615,8 @@ void wxDC::SetMapMode(int mode)
             return;
         }
 
-        double mm2pixelsX = pixel_width / mm_width,
-               mm2pixelsY = pixel_height / mm_height;
+        double mm2pixelsX = (double)pixel_width / mm_width,
+               mm2pixelsY = (double)pixel_height / mm_height;
 
         switch (mode)
         {
@@ -2280,7 +2280,7 @@ static bool AlphaBlt(HDC hdcDst,
     wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?
-#ifdef AC_SRC_OVER
+#if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
     // yes, now try to see if we have it during run-time
     typedef BOOL (WINAPI *AlphaBlend_t)(HDC,int,int,int,int,
                                         HDC,int,int,int,int,