X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25889d3c43f537fea00a2b7d6df7bd7e63e113f8..7e256c24fbe8c432b4c122d0fa2b60a59aba94f2:/src/msw/dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index a7b088cb0e..d693d7a278 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -68,58 +68,6 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
-// ---------------------------------------------------------------------------
-// macros
-// ---------------------------------------------------------------------------
-
-// Logical to device
-// Absolute
-#define XLOG2DEV(x) (x)
-#define YLOG2DEV(y) (y)
-
-// Relative
-#define XLOG2DEVREL(x) (x)
-#define YLOG2DEVREL(y) (y)
-
-// Device to logical
-// Absolute
-#define XDEV2LOG(x) (x)
-
-#define YDEV2LOG(y) (y)
-
-// Relative
-#define XDEV2LOGREL(x) (x)
-#define YDEV2LOGREL(y) (y)
-
-/*
- * Have the same macros as for XView but not for every operation:
- * just for calculating window/viewport extent (a better way of scaling).
- */
-
-// Logical to device
-// Absolute
-#define MS_XLOG2DEV(x) LogicalToDevice(x)
-
-#define MS_YLOG2DEV(y) LogicalToDevice(y)
-
-// Relative
-#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x)
-#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y)
-
-// Device to logical
-// Absolute
-#define MS_XDEV2LOG(x) DeviceToLogicalX(x)
-
-#define MS_YDEV2LOG(y) DeviceToLogicalY(y)
-
-// Relative
-#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
-#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
-
-#define YSCALE(y) (yorigin - (y))
-
-#define     wx_round(a)    (int)((a)+.5)
-
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -295,14 +243,19 @@ int wxDC::GetDepth() const
 void wxDC::Clear()
 {
     RECT rect;
-    if (m_canvas)
+    if ( m_canvas )
+    {
         GetClientRect((HWND) m_canvas->GetHWND(), &rect);
-    else if (m_selectedBitmap.Ok())
+    }
+    else
     {
+        wxCHECK_RET( m_selectedBitmap.Ok(), _T("this DC can't be cleared") );
+
         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
         rect.bottom = m_selectedBitmap.GetHeight();
     }
+
     (void) ::SetMapMode(GetHdc(), MM_TEXT);
 
     DWORD colour = GetBkColor(GetHdc());
@@ -680,11 +633,15 @@ void wxDC::DoDrawText(const wxString& text, long x, long y)
     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);
 
+    // background colour is used only for DrawText, otherwise
+    // always TRANSPARENT, RR
+    SetBkMode(GetHdc(), TRANSPARENT);
+
     CalcBoundingBox(x, y);
 
     long w, h;
@@ -755,7 +712,7 @@ void wxDC::SetFont(const wxFont& the_font)
         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;
@@ -868,10 +825,15 @@ void wxDC::SetBackgroundMode(int mode)
 {
     m_backgroundMode = mode;
 
+    // SetBackgroundColour now only refers to text background
+    // and m_backgroundMode is used there
+
+/*
     if (m_backgroundMode == wxTRANSPARENT)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
-        ::SetBkMode(GetHdc(), OPAQUE);
+	::SetBkMode(GetHdc(), OPAQUE);
+*/
 }
 
 void wxDC::SetLogicalFunction(int function)
@@ -962,7 +924,7 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
     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);