Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index edd4fe4fa5679f7236fcb61f7eb32c4504bcd8d3..0887188c47ab90e9310aec0bf837e690113c8a20 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -40,6 +40,7 @@
     #include "wx/icon.h"
 #endif
 
     #include "wx/icon.h"
 #endif
 

+#include "wx/settings.h"

 #include "wx/dcprint.h"
 
 #include <string.h>
 #include "wx/dcprint.h"
 
 #include <string.h>


@@ -263,24 +264,29 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
 // clipping
 // ---------------------------------------------------------------------------
 

-#define DO_SET_CLIPPING_BOX()                   \
-{                                               \
-    RECT rect;                                  \
-                                                \
-    GetClipBox(GetHdc(), &rect);                \
-                                                \
-    m_clipX1 = (wxCoord) XDEV2LOG(rect.left);   \
-    m_clipY1 = (wxCoord) YDEV2LOG(rect.top);    \
-    m_clipX2 = (wxCoord) XDEV2LOG(rect.right);  \
-    m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); \
+void wxDC::UpdateClipBox()
+{
+    RECT rect;
+    GetClipBox(GetHdc(), &rect);
+
+    m_clipX1 = (wxCoord) XDEV2LOG(rect.left);
+    m_clipY1 = (wxCoord) YDEV2LOG(rect.top);
+    m_clipX2 = (wxCoord) XDEV2LOG(rect.right);
+    m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom);

 }
 
 }
 

-void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
     m_clipping = TRUE;
 
 {
     m_clipping = TRUE;
 

-    HRGN hrgn = ::CreateRectRgn(XLOG2DEV(cx), YLOG2DEV(cy),
-                                XLOG2DEV(cx + cw), YLOG2DEV(cy + ch));
+    // the region coords are always the device ones, so do the translation
+    // manually
+    //
+    // FIXME: possible +/-1 error here, to check!
+    HRGN hrgn = ::CreateRectRgn(LogicalToDeviceX(x),
+                                LogicalToDeviceY(y),
+                                LogicalToDeviceX(x + w),
+                                LogicalToDeviceY(y + h));

     if ( !hrgn )
     {
         wxLogLastError(_T("CreateRectRgn"));
     if ( !hrgn )
     {
         wxLogLastError(_T("CreateRectRgn"));


@@ -292,23 +298,23 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
             wxLogLastError(_T("SelectClipRgn"));
         }
 
             wxLogLastError(_T("SelectClipRgn"));
         }
 

-        DO_SET_CLIPPING_BOX()
+        UpdateClipBox();

     }
 }
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {
     }
 }
 
 void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 {

-    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
+    wxCHECK_RET( GetHrgnOf(region), wxT("invalid clipping region") );

 
     m_clipping = TRUE;
 
 #ifdef __WIN16__
 
     m_clipping = TRUE;
 
 #ifdef __WIN16__

-    SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
-#else
-    ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);
-#endif
+    SelectClipRgn(GetHdc(), GetHrgnOf(region));
+#else // Win32
+    ExtSelectClipRgn(GetHdc(), GetHrgnOf(region), RGN_AND);
+#endif // Win16/32

 
 

-    DO_SET_CLIPPING_BOX()
+    UpdateClipBox();

 }
 
 void wxDC::DestroyClippingRegion()
 }
 
 void wxDC::DestroyClippingRegion()


@@ -322,6 +328,7 @@ void wxDC::DestroyClippingRegion()
         SelectClipRgn(GetHdc(), rgn);
         DeleteObject(rgn);
     }
         SelectClipRgn(GetHdc(), rgn);
         DeleteObject(rgn);
     }

+

     m_clipping = FALSE;
 }
 
     m_clipping = FALSE;
 }
 


@@ -336,10 +343,15 @@ bool wxDC::CanDrawBitmap() const
 
 bool wxDC::CanGetTextExtent() const
 {
 
 bool wxDC::CanGetTextExtent() const
 {

+#ifdef __WXMICROWIN__
+    // TODO Extend MicroWindows' GetDeviceCaps function
+    return TRUE;
+#else

     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
 
     return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
 
     return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);

+#endif

 }
 
 int wxDC::GetDepth() const
 }
 
 int wxDC::GetDepth() const


@@ -509,7 +521,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 
     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 

-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__WXMICROWIN__)

     RECT rect;
     rect.left   = x1;
     rect.top    = y1;
     RECT rect;
     rect.left   = x1;
     rect.top    = y1;


@@ -894,6 +906,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
     {
         DoDrawText(text, x, y);
     }
     {
         DoDrawText(text, x, y);
     }

+#ifndef __WXMICROWIN__

     else
     {
         // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so
     else
     {
         // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so


@@ -944,6 +957,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
         CalcBoundingBox(x, y);
         CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
     }
         CalcBoundingBox(x, y);
         CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
     }

+#endif

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