WXDLLEXPORTLOCAL removed, WXDLLEXPORT seems to be enough

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index d1590decfadc7c8e53b8421227c95fca63f9aabe..a7b088cb0e630c4f42b12766eea485f893e8104c 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,10 +28,8 @@
     #pragma hdrstop
 #endif
 
-#include "wx/frame.h"
-#include "wx/msw/private.h"
-
 #ifndef WX_PRECOMP
+    #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
@@ -39,6 +37,7 @@
     #include "wx/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/log.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/dcprint.h"
@@ -54,6 +53,8 @@
     #include <print.h>
 #endif
 
+#include "wx/msw/private.h"
+
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif
@@ -558,7 +559,7 @@ void wxDC::DoDrawRoundedRectangle(long x, long y, long width, long height, doubl
     long y2 = (y+height);
 
     (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
-        YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
+        YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);