wxPython 2.1b1 for wxMSW (wxGTK coming soon)

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 52726e5100b230074b2d6c9f26772c9e521a788f..f53d6d84f729c0d014be7d9f5ed97255a10dfdcd 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,10 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/frame.h"
-#include "wx/msw/private.h"
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/window.h"

     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.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/bitmap.h"
     #include "wx/dcmemory.h"
     #include "wx/log.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/dcprint.h"
 #endif
 
 #include "wx/dcprint.h"


@@ -54,6 +53,8 @@
     #include <print.h>
 #endif
 
     #include <print.h>
 #endif
 

+#include "wx/msw/private.h"
+

 #if !USE_SHARED_LIBRARY
     IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 #endif
 #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),
     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);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);


@@ -639,7 +640,6 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);

-        ::SelectObject( memdc, 0 );

         ::DeleteDC( memdc );
     }
     else
         ::DeleteDC( memdc );
     }
     else


@@ -680,7 +680,7 @@ void wxDC::DoDrawText(const wxString& text, long x, long y)
     else
         SetBkMode(GetHdc(), OPAQUE);
 
     else
         SetBkMode(GetHdc(), OPAQUE);
 

-    (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
+    (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text));

 
     if (m_textBackgroundColour.Ok())
         (void)SetBkColor(GetHdc(), old_background);
 
     if (m_textBackgroundColour.Ok())
         (void)SetBkColor(GetHdc(), old_background);


@@ -755,7 +755,7 @@ void wxDC::SetFont(const wxFont& the_font)
         HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
         if (f == (HFONT) NULL)
         {
         HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
         if (f == (HFONT) NULL)
         {

-            wxLogDebug("::SelectObject failed in wxDC::SetFont.");
+            wxLogDebug(_T("::SelectObject failed in wxDC::SetFont."));

         }
         if (!m_oldFont)
             m_oldFont = (WXHFONT) f;
         }
         if (!m_oldFont)
             m_oldFont = (WXHFONT) f;


@@ -962,7 +962,7 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
     SIZE sizeRect;
     TEXTMETRIC tm;
 
     SIZE sizeRect;
     TEXTMETRIC tm;
 

-    GetTextExtentPoint(GetHdc(), (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
+    GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);

     GetTextMetrics(GetHdc(), &tm);
 
     if (x) *x = XDEV2LOGREL(sizeRect.cx);
     GetTextMetrics(GetHdc(), &tm);
 
     if (x) *x = XDEV2LOGREL(sizeRect.cx);


@@ -1105,22 +1105,22 @@ long wxDCBase::DeviceToLogicalYRel(long y) const
 
 long wxDCBase::LogicalToDeviceX(long x) const
 {
 
 long wxDCBase::LogicalToDeviceX(long x) const
 {

-    return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
+    return (long) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);

 }
 
 long wxDCBase::LogicalToDeviceXRel(long x) const
 {
 }
 
 long wxDCBase::LogicalToDeviceXRel(long x) const
 {

-    return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);
+    return (long) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);

 }
 
 long wxDCBase::LogicalToDeviceY(long y) const
 {
 }
 
 long wxDCBase::LogicalToDeviceY(long y) const
 {

-    return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
+    return (long) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);

 }
 
 long wxDCBase::LogicalToDeviceYRel(long y) const
 {
 }
 
 long wxDCBase::LogicalToDeviceYRel(long y) const
 {

-    return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);
+    return (long) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------