#include "wx/msw/wrapcdlg.h"
#include "wx/image.h"
#include "wx/window.h"
- #include "wx/dc.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/app.h"
#include "wx/module.h"
#endif
+#include "wx/msw/dc.h"
#include "wx/sysopt.h"
#include "wx/dynlib.h"
-#ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
+#ifdef wxHAS_RAW_BITMAP
+ #include "wx/rawbmp.h"
#endif
#include <string.h>
-#ifndef __WIN32__
- #include <print.h>
-#endif
+#include "wx/msw/private/dc.h"
+
+using namespace wxMSWImpl;
#ifndef AC_SRC_ALPHA
#define AC_SRC_ALPHA 1
#define WXMICROWIN_CHECK_HDC_RET(x)
#endif
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
+IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)
// ---------------------------------------------------------------------------
// constants
static const int VIEWPORT_EXTENT = 1000;
-static const int MM_POINTS = 9;
-static const int MM_METRIC = 10;
-
// ROPs which don't have standard names (see "Ternary Raster Operations" in the
// MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
#define DSTCOPY 0x00AA0029 // a.k.a. NOP operation
// otherwise
static bool AlphaBlt(HDC hdcDst,
int x, int y, int dstWidth, int dstHeight,
- int srcX, int srcY,
+ int srcX, int srcY,
int srcWidth, int srcHeight,
HDC hdcSrc,
const wxBitmap& bmp);
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
// our (limited) AlphaBlend() replacement for Windows versions not providing it
static void
wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
int dstWidth, int dstHeight,
- int srcX, int srcY,
+ int srcX, int srcY,
int srcWidth, int srcHeight,
const wxBitmap& bmpSrc);
-#endif // wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
// ----------------------------------------------------------------------------
// private classes
// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
// encapsulate this in a small helper class
-// wxColourChanger: changes the text colours in the ctor if required and
+// wxBrushAttrsSetter: changes the text colours in the ctor if required and
// restores them in the dtor
-class wxColourChanger
+class wxBrushAttrsSetter : private wxBkModeChanger,
+ private wxTextColoursChanger
{
public:
- wxColourChanger(wxDC& dc);
- ~wxColourChanger();
+ wxBrushAttrsSetter(wxMSWDCImpl& dc);
private:
- wxDC& m_dc;
+ wxDECLARE_NO_COPY_CLASS(wxBrushAttrsSetter);
+};
- COLORREF m_colFgOld, m_colBgOld;
+#ifdef __WXWINCE__
- bool m_changed;
+#define SET_STRETCH_BLT_MODE(hdc)
- DECLARE_NO_COPY_CLASS(wxColourChanger)
-};
+#else // !__WXWINCE__
-// this class saves the old stretch blit mode during its life time
+// this class sets the stretch blit mode to COLORONCOLOR during its lifetime
+//
+// don't use it directly, use SET_STRETCH_BLT_MODE() macro instead as it
+// expands to nothing under WinCE which doesn't have SetStretchBltMode()
class StretchBltModeChanger
{
public:
- StretchBltModeChanger(HDC hdc,
- int WXUNUSED_IN_WINCE(mode))
+ StretchBltModeChanger(HDC hdc)
: m_hdc(hdc)
{
-#ifndef __WXWINCE__
- m_modeOld = ::SetStretchBltMode(m_hdc, mode);
+ m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR);
if ( !m_modeOld )
- wxLogLastError(_T("SetStretchBltMode"));
-#endif
+ {
+ wxLogLastError(wxT("SetStretchBltMode"));
+ }
}
~StretchBltModeChanger()
{
-#ifndef __WXWINCE__
if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
- wxLogLastError(_T("SetStretchBltMode"));
-#endif
+ {
+ wxLogLastError(wxT("SetStretchBltMode"));
+ }
}
private:
int m_modeOld;
- DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
+ wxDECLARE_NO_COPY_CLASS(StretchBltModeChanger);
};
+#define SET_STRETCH_BLT_MODE(hdc) \
+ StretchBltModeChanger wxMAKE_UNIQUE_NAME(stretchModeChanger)(hdc)
+
+#endif // __WXWINCE__/!__WXWINCE__
+
+#if wxUSE_DYNLIB_CLASS
+
// helper class to cache dynamically loaded libraries and not attempt reloading
// them if it fails
class wxOnceOnlyDLLLoader
return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
}
+ void Unload()
+ {
+ if ( m_dll.IsLoaded() )
+ {
+ m_dll.Unload();
+ }
+ }
+
private:
wxDynamicLibrary m_dll;
const wxChar *m_dllName;
};
-static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
-static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(wxT("msimg32"));
+
+// we must ensure that DLLs are unloaded before the static objects cleanup time
+// because we may hit the notorious DllMain() dead lock in this case if wx is
+// used as a DLL (attempting to unload another DLL from inside DllMain() hangs
+// under Windows because it tries to reacquire the same lock)
+class wxGDIDLLsCleanupModule : public wxModule
+{
+public:
+ virtual bool OnInit() { return true; }
+ virtual void OnExit() { wxMSIMG32DLL.Unload(); }
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule)
+
+#endif // wxUSE_DYNLIB_CLASS
// ===========================================================================
// implementation
// ===========================================================================
// ----------------------------------------------------------------------------
-// wxColourChanger
+// wxBrushAttrsSetter
// ----------------------------------------------------------------------------
-wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc)
+ : wxBkModeChanger(GetHdcOf(dc)),
+ wxTextColoursChanger(GetHdcOf(dc))
{
const wxBrush& brush = dc.GetBrush();
- if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+ if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE )
{
- HDC hdc = GetHdcOf(dc);
- m_colFgOld = ::GetTextColor(hdc);
- m_colBgOld = ::GetBkColor(hdc);
-
// note that Windows convention is opposite to wxWidgets one, this is
// why text colour becomes the background one and vice versa
- const wxColour& colFg = dc.GetTextForeground();
- if ( colFg.Ok() )
- {
- ::SetBkColor(hdc, colFg.GetPixel());
- }
+ wxTextColoursChanger::Change(dc.GetTextBackground(),
+ dc.GetTextForeground());
- const wxColour& colBg = dc.GetTextBackground();
- if ( colBg.Ok() )
- {
- ::SetTextColor(hdc, colBg.GetPixel());
- }
-
- SetBkMode(hdc,
- dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
-
- // flag which telsl us to undo changes in the dtor
- m_changed = true;
- }
- else
- {
- // nothing done, nothing to undo
- m_changed = false;
+ wxBkModeChanger::Change(dc.GetBackgroundMode());
}
}
-wxColourChanger::~wxColourChanger()
-{
- if ( m_changed )
- {
- // restore the colours we changed
- HDC hdc = GetHdcOf(m_dc);
+// ----------------------------------------------------------------------------
+// wxDC MSW-specific methods
+// ----------------------------------------------------------------------------
- ::SetBkMode(hdc, TRANSPARENT);
- ::SetTextColor(hdc, m_colFgOld);
- ::SetBkColor(hdc, m_colBgOld);
- }
+WXHDC wxDC::GetHDC() const
+{
+ wxMSWDCImpl * const impl = wxDynamicCast(GetImpl(), wxMSWDCImpl);
+ return impl ? impl->GetHDC() : 0;
}
// ---------------------------------------------------------------------------
-// wxDC
+// wxMSWDCImpl
// ---------------------------------------------------------------------------
-wxDC::~wxDC()
+wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) :
+ wxDCImpl( owner )
+{
+ Init();
+ m_hDC = hDC;
+}
+
+wxMSWDCImpl::~wxMSWDCImpl()
{
if ( m_hDC != 0 )
{
}
else // we don't own our HDC
{
- if (m_canvas)
+ if (m_window)
{
- ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+ ::ReleaseDC(GetHwndOf(m_window), GetHdc());
}
else
{
// This will select current objects out of the DC,
// which is what you have to do before deleting the
// DC.
-void wxDC::SelectOldObjects(WXHDC dc)
+void wxMSWDCImpl::SelectOldObjects(WXHDC dc)
{
if (dc)
{
if (m_oldBitmap)
{
::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
-#ifdef __WXDEBUG__
- if (m_selectedBitmap.Ok())
+ if (m_selectedBitmap.IsOk())
{
m_selectedBitmap.SetSelectedInto(NULL);
}
-#endif
}
m_oldBitmap = 0;
if (m_oldPen)
// clipping
// ---------------------------------------------------------------------------
-void wxDC::UpdateClipBox()
+void wxMSWDCImpl::UpdateClipBox()
{
WXMICROWIN_CHECK_HDC
}
void
-wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
{
// check if we should try to retrieve the clipping region possibly not set
// by our SetClippingRegion() but preset by Windows:this can only happen
// when we're associated with an existing HDC usign SetHDC(), see there
if ( m_clipping && !m_clipX1 && !m_clipX2 )
{
- wxDC *self = wxConstCast(this, wxDC);
+ wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl);
self->UpdateClipBox();
if ( !m_clipX1 && !m_clipX2 )
self->m_clipping = false;
}
- wxDCBase::DoGetClippingBox(x, y, w, h);
+ wxDCImpl::DoGetClippingBox(x, y, w, h);
}
-// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
-void wxDC::SetClippingHrgn(WXHRGN hrgn)
+// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
+void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
{
wxCHECK_RET( hrgn, wxT("invalid clipping region") );
#else // !WinCE
if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
{
- wxLogLastError(_T("ExtSelectClipRgn"));
+ wxLogLastError(wxT("ExtSelectClipRgn"));
return;
}
UpdateClipBox();
}
-void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
// the region coords are always the device ones, so do the translation
// manually
LogicalToDeviceY(y + h));
if ( !hrgn )
{
- wxLogLastError(_T("CreateRectRgn"));
+ wxLogLastError(wxT("CreateRectRgn"));
}
else
{
}
}
-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
{
SetClippingHrgn(region.GetHRGN());
}
-void wxDC::DestroyClippingRegion()
+void wxMSWDCImpl::DestroyClippingRegion()
{
WXMICROWIN_CHECK_HDC
#endif
}
- wxDCBase::DestroyClippingRegion();
+ wxDCImpl::DestroyClippingRegion();
}
// ---------------------------------------------------------------------------
// query capabilities
// ---------------------------------------------------------------------------
-bool wxDC::CanDrawBitmap() const
+bool wxMSWDCImpl::CanDrawBitmap() const
{
return true;
}
-bool wxDC::CanGetTextExtent() const
+bool wxMSWDCImpl::CanGetTextExtent() const
{
#ifdef __WXMICROWIN__
// TODO Extend MicroWindows' GetDeviceCaps function
#endif
}
-int wxDC::GetDepth() const
+int wxMSWDCImpl::GetDepth() const
{
WXMICROWIN_CHECK_HDC_RET(16)
// drawing
// ---------------------------------------------------------------------------
-void wxDC::Clear()
+void wxMSWDCImpl::Clear()
{
WXMICROWIN_CHECK_HDC
RECT rect;
- if ( m_canvas )
+ if (m_window)
{
- GetClientRect((HWND) m_canvas->GetHWND(), &rect);
+ GetClientRect((HWND) m_window->GetHWND(), &rect);
}
else
{
// No, I think we should simply ignore this if printing on e.g.
// a printer DC.
- // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
- if (!m_selectedBitmap.Ok())
+ // wxCHECK_RET( m_selectedBitmap.IsOk(), wxT("this DC can't be cleared") );
+ if (!m_selectedBitmap.IsOk())
return;
rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
::FillRect(GetHdc(), &rect, brush);
::DeleteObject(brush);
-#ifndef __WXWINCE__
- int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
- height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
- ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
- ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
- ::SetWindowExtEx(GetHdc(), width, height, NULL);
- ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
- ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+ RealizeScaleAndOrigin();
}
-bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
+bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
wxCoord WXUNUSED_IN_WINCE(y),
const wxColour& WXUNUSED_IN_WINCE(col),
- int WXUNUSED_IN_WINCE(style))
+ wxFloodFillStyle WXUNUSED_IN_WINCE(style))
{
#ifdef __WXWINCE__
return false;
#endif
}
-bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
{
WXMICROWIN_CHECK_HDC_RET(false)
- wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );
+ wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxMSWDCImpl::GetPixel") );
// get the color of the pixel
COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
return true;
}
-void wxDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
CalcBoundingBox(x2, y2);
}
-void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxMSWDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
WXMICROWIN_CHECK_HDC
// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
// and ending at (x2, y2)
-void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
+void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc)
{
+ double dx = xc - x1;
+ double dy = yc - y1;
+ wxCoord r = (wxCoord)sqrt(dx*dx + dy*dy);
+
+
#ifdef __WXWINCE__
// Slower emulation since WinCE doesn't support Pie and Arc
- double r = sqrt( (x1-xc)*(x1-xc) + (y1-yc)*(y1-yc) );
double sa = acos((x1-xc)/r)/M_PI*180; // between 0 and 180
- if( y1>yc ) sa = -sa; // below center
+ if( y1>yc )
+ sa = -sa; // below center
double ea = atan2(yc-y2, x2-xc)/M_PI*180;
DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea );
#else
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
-
- double dx = xc - x1;
- double dy = yc - y1;
- double radius = (double)sqrt(dx*dx+dy*dy);
- wxCoord r = (wxCoord)radius;
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// treat the special case of full circle separately
if ( x1 == x2 && y1 == y2 )
{
- DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+ GetOwner()->DrawEllipse(xc - r, yc - r, 2*r, 2*r);
return;
}
wxCoord yy2 = YLOG2DEV(y2);
wxCoord xxc = XLOG2DEV(xc);
wxCoord yyc = YLOG2DEV(yc);
- wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));
+ dx = xxc - xx1;
+ dy = yyc - yy1;
+ wxCoord ray = (wxCoord)sqrt(dx*dx + dy*dy);
wxCoord xxx1 = (wxCoord) (xxc-ray);
wxCoord yyy1 = (wxCoord) (yyc-ray);
wxCoord xxx2 = (wxCoord) (xxc+ray);
wxCoord yyy2 = (wxCoord) (yyc+ray);
- if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
+ if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )
{
// Have to add 1 to bottom-right corner of rectangle
// to make semi-circles look right (crooked line otherwise).
#endif
}
-void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,
wxCoord width, wxCoord height)
{
// cases when we don't have DrawFrameControl()
rect.bottom = y2;
#ifdef __WXWINCE__
- DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+ DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED);
#else
DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
#endif
#endif // Microwin/Normal
}
-void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
COLORREF color = 0x00ffffff;
- if (m_pen.Ok())
+ if (m_pen.IsOk())
{
color = m_pen.GetColour().GetPixel();
}
CalcBoundingBox(x, y);
}
-void wxDC::DoDrawPolygon(int n,
+void wxMSWDCImpl::DoDrawPolygon(int n,
wxPoint points[],
wxCoord xoffset,
wxCoord yoffset,
- int WXUNUSED_IN_WINCE(fillStyle))
+ wxPolygonFillMode WXUNUSED_IN_WINCE(fillStyle))
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Do things less efficiently if we have offsets
if (xoffset != 0 || yoffset != 0)
}
void
-wxDC::DoDrawPolyPolygon(int n,
+wxMSWDCImpl::DoDrawPolyPolygon(int n,
int count[],
wxPoint points[],
wxCoord xoffset,
wxCoord yoffset,
- int fillStyle)
+ wxPolygonFillMode fillStyle)
{
#ifdef __WXWINCE__
- wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+ wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
#else
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
int i, cnt;
for (i = cnt = 0; i < n; i++)
cnt += count[i];
// __WXWINCE__
}
-void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
{
WXMICROWIN_CHECK_HDC
}
}
-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
wxCoord x2 = x + width;
wxCoord y2 = y + height;
- if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
- {
- RECT rect;
- rect.left = XLOG2DEV(x);
- rect.top = YLOG2DEV(y);
- rect.right = XLOG2DEV(x2);
- rect.bottom = YLOG2DEV(y2);
- (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
- }
- else
- {
- // Windows draws the filled rectangles without outline (i.e. drawn with a
- // transparent pen) one pixel smaller in both directions and we want them
- // to have the same size regardless of which pen is used - adjust
+ wxCoord x2dev = XLOG2DEV(x2),
+ y2dev = YLOG2DEV(y2);
- // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
- if ( m_pen.GetStyle() == wxTRANSPARENT )
- {
- // Apparently not needed for WinCE (see e.g. Life! demo)
+ // Windows (but not Windows CE) draws the filled rectangles without outline
+ // (i.e. drawn with a transparent pen) one pixel smaller in both directions
+ // and we want them to have the same size regardless of which pen is used
#ifndef __WXWINCE__
- x2++;
- y2++;
-#endif
- }
-
- (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+ if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
+ {
+ x2dev++;
+ y2dev++;
}
+#endif // !__WXWINCE__
+ (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev);
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
}
-void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
// Now, a negative radius value is interpreted to mean
// 'the proportion of the smallest X or Y dimension'
// Windows draws the filled rectangles without outline (i.e. drawn with a
// transparent pen) one pixel smaller in both directions and we want them
// to have the same size regardless of which pen is used - adjust
- if ( m_pen.GetStyle() == wxTRANSPARENT )
+ if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
{
x2++;
y2++;
CalcBoundingBox(x2, y2);
}
-void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
- wxCoord x2 = (x+width);
- wxCoord y2 = (y+height);
+ // +1 below makes the ellipse more similar to other platforms.
+ // In particular, DoDrawEllipse(x,y,1,1) should draw one point.
+ wxCoord x2 = x + width + 1;
+ wxCoord y2 = y + height + 1;
+
+ // Problem: Windows GDI Ellipse() with x2-x == y2-y == 3 and transparent
+ // pen doesn't draw anything. Should we provide a workaround?
- (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+ ::Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
CalcBoundingBox(x, y);
CalcBoundingBox(x2, y2);
}
-#if wxUSE_SPLINES
-void wxDC::DoDrawSpline(wxList *points)
+#if wxUSE_SPLINES && !defined(__WXWINCE__)
+void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
{
-#ifdef __WXWINCE__
- // WinCE does not support ::PolyBezier so use generic version
- wxDCBase::DoDrawSpline(points);
-#else
// quadratic b-spline to cubic bezier spline conversion
//
// quadratic spline with control points P0,P1,P2
size_t bezier_pos = 0;
wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4;
- wxList::compatibility_iterator node = points->GetFirst();
- wxPoint *p = (wxPoint *)node->GetData();
+ wxPointList::compatibility_iterator node = points->GetFirst();
+ wxPoint *p = node->GetData();
lppt[ bezier_pos ].x = x1 = p->x;
lppt[ bezier_pos ].y = y1 = p->y;
bezier_pos++;
bezier_pos++;
node = node->GetNext();
- p = (wxPoint *)node->GetData();
+ p = node->GetData();
x2 = p->x;
y2 = p->y;
::PolyBezier( GetHdc(), lppt, bezier_pos );
free(lppt);
-#endif
}
-#endif
+#endif // wxUSE_SPLINES
// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
-void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
#ifdef __WXWINCE__
DoDrawEllipticArcRot( x, y, w, h, sa, ea );
WXMICROWIN_CHECK_HDC
- wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+ wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
wxCoord x2 = x + w;
wxCoord y2 = y + h;
rx2 += (int)(100.0 * abs(w) * cos(ea));
ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));
+ // Swap start and end positions if the end angle is less than the start angle.
+ if (ea < sa) {
+ int temp;
+ temp = rx2;
+ rx2 = rx1;
+ rx1 = temp;
+ temp = ry2;
+ ry2 = ry1;
+ ry1 = temp;
+ }
+
// draw pie with NULL_PEN first and then outline otherwise a line is
// drawn from the start and end points to the centre
HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
#endif
}
-void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
- wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+ wxCHECK_RET( icon.IsOk(), wxT("invalid icon in DrawIcon") );
#ifdef __WIN32__
::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
}
-void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
+void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
{
WXMICROWIN_CHECK_HDC
- wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
+ wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
int width = bmp.GetWidth(),
height = bmp.GetHeight();
return;
}
+ SET_STRETCH_BLT_MODE(GetHdc());
+
if ( useMask )
{
wxMask *mask = bmp.GetMask();
#ifdef __WIN32__
// use MaskBlt() with ROP which doesn't do anything to dst in the mask
// points
+ bool ok = false;
+
+#if wxUSE_SYSTEM_OPTIONS
// On some systems, MaskBlt succeeds yet is much much slower
// than the wxWidgets fall-back implementation. So we need
// to be able to switch this on and off at runtime.
- bool ok = false;
-#if wxUSE_SYSTEM_OPTIONS
- if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
-#endif
+ //
+ // NB: don't query the value of the option every time but do it only
+ // once as otherwise it can have real (and bad) performance
+ // implications (see #11172)
+ static bool
+ s_maskBltAllowed = wxSystemOptions::GetOptionInt("no-maskblt") == 0;
+ if ( s_maskBltAllowed )
+#endif // wxUSE_SYSTEM_OPTIONS
{
HDC cdc = GetHdc();
HDC hdcMem = ::CreateCompatibleDC(GetHdc());
if ( !ok )
#endif // Win32
{
- // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+ // Rather than reproduce wxMSWDCImpl::Blit, let's do it at the wxWin API
// level
wxMemoryDC memDC;
memDC.SelectObjectAsSource(bmp);
- Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+ GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
memDC.SelectObject(wxNullBitmap);
}
wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
- COLORREF old_textground = ::GetTextColor(GetHdc());
- COLORREF old_background = ::GetBkColor(GetHdc());
- if (m_textForegroundColour.Ok())
- {
- ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
- }
- if (m_textBackgroundColour.Ok())
- {
- ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
+ wxTextColoursChanger textCol(GetHdc(), *this);
#if wxUSE_PALETTE
wxPalette *pal = bmp.GetPalette();
::SelectObject( memdc, hOldBitmap );
::DeleteDC( memdc );
-
- ::SetTextColor(GetHdc(), old_textground);
- ::SetBkColor(GetHdc(), old_background);
}
}
-void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
CalcBoundingBox(x, y);
wxCoord w, h;
- GetTextExtent(text, &w, &h);
+ GetOwner()->GetTextExtent(text, &w, &h);
CalcBoundingBox(x + w, y + h);
}
-void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
// prepare for drawing the text
- if ( m_textForegroundColour.Ok() )
- SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
+ wxTextColoursChanger textCol(GetHdc(), *this);
- DWORD old_background = 0;
- if ( m_textBackgroundColour.Ok() )
- {
- old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
-
- SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
- : OPAQUE);
+ wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
-#ifdef __WXWINCE__
if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
text.c_str(), text.length(), NULL) == 0 )
{
wxLogLastError(wxT("TextOut"));
}
-#else
- if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
- text.c_str(), text.length()) == 0 )
- {
- wxLogLastError(wxT("TextOut"));
- }
-#endif
-
- // restore the old parameters (text foreground colour may be left because
- // it never is set to anything else, but background should remain
- // transparent even if we just drew an opaque string)
- if ( m_textBackgroundColour.Ok() )
- (void)SetBkColor(GetHdc(), old_background);
-
- SetBkMode(GetHdc(), TRANSPARENT);
}
-void wxDC::DoDrawRotatedText(const wxString& text,
+void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
wxCoord x, wxCoord y,
double angle)
{
// "else" part below to avoid that DrawRotatedText(angle = 180) and
// DrawRotatedText(angle = 0) use different fonts (we can't use the default
// font for drawing rotated fonts unfortunately)
- if ( (angle == 0.0) && m_font.Ok() )
+ if ( (angle == 0.0) && m_font.IsOk() )
{
DoDrawText(text, x, y);
}
// NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
// because it's not TrueType and so can't have non zero
// orientation/escapement under Win9x
- wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT;
+ wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT;
HFONT hfont = (HFONT)font.GetResourceHandle();
LOGFONT lf;
if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
// containing the text to it (simpler and probably not slower than
// determining which of them is really topmost/leftmost/...)
wxCoord w, h;
- GetTextExtent(text, &w, &h);
+ GetOwner()->GetTextExtent(text, &w, &h);
double rad = DegToRad(angle);
#if wxUSE_PALETTE
-void wxDC::DoSelectPalette(bool realize)
+void wxMSWDCImpl::DoSelectPalette(bool realize)
{
WXMICROWIN_CHECK_HDC
m_oldPalette = 0;
}
- if ( m_palette.Ok() )
+ if ( m_palette.IsOk() )
{
HPALETTE oldPal = ::SelectPalette(GetHdc(),
GetHpaletteOf(m_palette),
}
}
-void wxDC::SetPalette(const wxPalette& palette)
+void wxMSWDCImpl::SetPalette(const wxPalette& palette)
{
- if ( palette.Ok() )
+ if ( palette.IsOk() )
{
m_palette = palette;
DoSelectPalette(true);
}
}
-void wxDC::InitializePalette()
+void wxMSWDCImpl::InitializePalette()
{
if ( wxDisplayDepth() <= 8 )
{
// look for any window or parent that has a custom palette. If any has
// one then we need to use it in drawing operations
- wxWindow *win = m_canvas->GetAncestorWithCustomPalette();
+ wxWindow *win = m_window->GetAncestorWithCustomPalette();
m_hasCustomPalette = win && win->HasCustomPalette();
if ( m_hasCustomPalette )
// SetFont/Pen/Brush() really ask to be implemented as a single template
// function... but doing it is not worth breaking OpenWatcom build <sigh>
-void wxDC::SetFont(const wxFont& font)
+void wxMSWDCImpl::SetFont(const wxFont& font)
{
WXMICROWIN_CHECK_HDC
if ( font == m_font )
return;
- if ( font.Ok() )
+ if ( font.IsOk() )
{
HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
if ( hfont == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(font)"));
+ wxLogLastError(wxT("SelectObject(font)"));
}
else // selected ok
{
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(old font)"));
+ wxLogLastError(wxT("SelectObject(old font)"));
}
m_oldFont = 0;
}
}
-void wxDC::SetPen(const wxPen& pen)
+void wxMSWDCImpl::SetPen(const wxPen& pen)
{
WXMICROWIN_CHECK_HDC
if ( pen == m_pen )
return;
- if ( pen.Ok() )
+ if ( pen.IsOk() )
{
HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
if ( hpen == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(pen)"));
+ wxLogLastError(wxT("SelectObject(pen)"));
}
else // selected ok
{
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(old pen)"));
+ wxLogLastError(wxT("SelectObject(old pen)"));
}
m_oldPen = 0;
}
}
-void wxDC::SetBrush(const wxBrush& brush)
+void wxMSWDCImpl::SetBrush(const wxBrush& brush)
{
WXMICROWIN_CHECK_HDC
if ( brush == m_brush )
return;
- if ( brush.Ok() )
+ if ( brush.IsOk() )
{
// we must make sure the brush is aligned with the logical coordinates
- // before selecting it
+ // before selecting it or using the same brush for the background of
+ // different windows would result in discontinuities
+ wxSize sizeBrushBitmap = wxDefaultSize;
wxBitmap *stipple = brush.GetStipple();
- if ( stipple && stipple->Ok() )
+ if ( stipple && stipple->IsOk() )
+ sizeBrushBitmap = stipple->GetSize();
+ else if ( brush.IsHatch() )
+ sizeBrushBitmap = wxSize(8, 8);
+
+ if ( sizeBrushBitmap.IsFullySpecified() )
{
if ( !::SetBrushOrgEx
(
GetHdc(),
- m_deviceOriginX % stipple->GetWidth(),
- m_deviceOriginY % stipple->GetHeight(),
+ m_deviceOriginX % sizeBrushBitmap.x,
+ m_deviceOriginY % sizeBrushBitmap.y,
NULL // [out] previous brush origin
) )
{
- wxLogLastError(_T("SetBrushOrgEx()"));
+ wxLogLastError(wxT("SetBrushOrgEx()"));
}
}
HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
if ( hbrush == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(brush)"));
+ wxLogLastError(wxT("SelectObject(brush)"));
}
else // selected ok
{
{
if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
{
- wxLogLastError(_T("SelectObject(old brush)"));
+ wxLogLastError(wxT("SelectObject(old brush)"));
}
m_oldBrush = 0;
}
}
-void wxDC::SetBackground(const wxBrush& brush)
+void wxMSWDCImpl::SetBackground(const wxBrush& brush)
{
WXMICROWIN_CHECK_HDC
m_backgroundBrush = brush;
- if ( m_backgroundBrush.Ok() )
+ if ( m_backgroundBrush.IsOk() )
{
(void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
}
}
-void wxDC::SetBackgroundMode(int mode)
+void wxMSWDCImpl::SetBackgroundMode(int mode)
{
WXMICROWIN_CHECK_HDC
// and m_backgroundMode is used there
}
-void wxDC::SetLogicalFunction(int function)
+void wxMSWDCImpl::SetLogicalFunction(wxRasterOperationMode function)
{
WXMICROWIN_CHECK_HDC
SetRop(m_hDC);
}
-void wxDC::SetRop(WXHDC dc)
+void wxMSWDCImpl::SetRop(WXHDC dc)
{
if ( !dc || m_logicalFunction < 0 )
return;
case wxNAND: rop = R2_NOTMASKPEN; break;
case wxOR: rop = R2_MERGEPEN; break;
case wxSET: rop = R2_WHITE; break;
-
default:
- wxFAIL_MSG( wxT("unsupported logical function") );
- return;
+ wxFAIL_MSG( wxS("unknown logical function") );
+ return;
}
SetROP2(GetHdc(), rop);
}
-bool wxDC::StartDoc(const wxString& WXUNUSED(message))
+bool wxMSWDCImpl::StartDoc(const wxString& WXUNUSED(message))
{
// We might be previewing, so return true to let it continue.
return true;
}
-void wxDC::EndDoc()
+void wxMSWDCImpl::EndDoc()
{
}
-void wxDC::StartPage()
+void wxMSWDCImpl::StartPage()
{
}
-void wxDC::EndPage()
+void wxMSWDCImpl::EndPage()
{
}
// text metrics
// ---------------------------------------------------------------------------
-wxCoord wxDC::GetCharHeight() const
+wxCoord wxMSWDCImpl::GetCharHeight() const
{
WXMICROWIN_CHECK_HDC_RET(0)
return lpTextMetric.tmHeight;
}
-wxCoord wxDC::GetCharWidth() const
+wxCoord wxMSWDCImpl::GetCharWidth() const
{
WXMICROWIN_CHECK_HDC_RET(0)
return lpTextMetric.tmAveCharWidth;
}
-void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
wxCoord *descent, wxCoord *externalLeading,
- wxFont *font) const
+ const wxFont *font) const
{
#ifdef __WXMICROWIN__
if (!GetHDC())
HFONT hfontOld;
if ( font )
{
- wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") );
+ wxASSERT_MSG( font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );
hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
}
SIZE sizeRect;
const size_t len = string.length();
- if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
+ if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
{
- wxLogLastError(_T("GetTextExtentPoint32()"));
+ wxLogLastError(wxT("GetTextExtentPoint32()"));
}
#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
}
#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
- TEXTMETRIC tm;
- ::GetTextMetrics(GetHdc(), &tm);
-
if (x)
*x = sizeRect.cx;
if (y)
*y = sizeRect.cy;
- if (descent)
- *descent = tm.tmDescent;
- if (externalLeading)
- *externalLeading = tm.tmExternalLeading;
+
+ if ( descent || externalLeading )
+ {
+ TEXTMETRIC tm;
+ ::GetTextMetrics(GetHdc(), &tm);
+
+ if (descent)
+ *descent = tm.tmDescent;
+ if (externalLeading)
+ *externalLeading = tm.tmExternalLeading;
+ }
if ( hfontOld )
{
// Each element of the array will be the width of the string up to and
// including the coresoponding character in text.
-bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
{
static int maxLenText = -1;
static int maxWidth = -1;
return true;
}
+void wxMSWDCImpl::RealizeScaleAndOrigin()
+{
+ // although it may seem wasteful to always use MM_ANISOTROPIC here instead
+ // of using MM_TEXT if there is no scaling, benchmarking doesn't detect any
+ // noticeable difference between these mapping modes
+#ifndef __WXWINCE__
+ ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
+ int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+ height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+ ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+ ::SetWindowExtEx(GetHdc(), width, height, NULL);
-void wxDC::SetMapMode(int mode)
+ ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
+ ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
+#endif
+}
+
+void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
{
WXMICROWIN_CHECK_HDC
break;
default:
- wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
+ wxFAIL_MSG( wxT("unknown mapping mode in SetMapMode") );
}
}
- // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
- // cases we could do with MM_TEXT and in the remaining 0.9% with
- // MM_ISOTROPIC (TODO!)
-#ifndef __WXWINCE__
- ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
- int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
- height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
- ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
- ::SetWindowExtEx(GetHdc(), width, height, NULL);
+ ComputeScaleAndOrigin();
- ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
- ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
-#endif
+ RealizeScaleAndOrigin();
}
-void wxDC::SetUserScale(double x, double y)
+void wxMSWDCImpl::SetUserScale(double x, double y)
{
WXMICROWIN_CHECK_HDC
if ( x == m_userScaleX && y == m_userScaleY )
return;
- m_userScaleX = x;
- m_userScaleY = y;
+ wxDCImpl::SetUserScale(x,y);
- this->SetMapMode(m_mappingMode);
+ RealizeScaleAndOrigin();
}
-void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight),
- bool WXUNUSED_IN_WINCE(yBottomUp))
+void wxMSWDCImpl::SetAxisOrientation(bool xLeftRight,
+ bool yBottomUp)
{
WXMICROWIN_CHECK_HDC
-#ifndef __WXWINCE__
int signX = xLeftRight ? 1 : -1,
signY = yBottomUp ? -1 : 1;
- if ( signX != m_signX || signY != m_signY )
- {
- m_signX = signX;
- m_signY = signY;
+ if (signX == m_signX && signY == m_signY)
+ return;
- SetMapMode(m_mappingMode);
- }
-#endif
+ wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp );
+
+ RealizeScaleAndOrigin();
}
-void wxDC::SetSystemScale(double x, double y)
+void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
- if ( x == m_scaleX && y == m_scaleY )
+ if ( x == m_logicalOriginX && y == m_logicalOriginY )
return;
- m_scaleX = x;
- m_scaleY = y;
+ wxDCImpl::SetLogicalOrigin( x, y );
-#ifndef __WXWINCE__
- SetMapMode(m_mappingMode);
-#endif
+ RealizeScaleAndOrigin();
}
-void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
+// For use by wxWidgets only, unless custom units are required.
+void wxMSWDCImpl::SetLogicalScale(double x, double y)
{
WXMICROWIN_CHECK_HDC
- if ( x == m_logicalOriginX && y == m_logicalOriginY )
- return;
-
- m_logicalOriginX = x;
- m_logicalOriginY = y;
-
-#ifndef __WXWINCE__
- ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+ wxDCImpl::SetLogicalScale(x,y);
}
-void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
+void wxMSWDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
if ( x == m_deviceOriginX && y == m_deviceOriginY )
return;
- m_deviceOriginX = x;
- m_deviceOriginY = y;
+ wxDCImpl::SetDeviceOrigin( x, y );
::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
}
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
-{
- return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;
-}
-
-wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));
-}
-
-wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
-{
- return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;
-}
-
-wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));
-}
-
-wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
-{
- return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;
-}
-
-wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
-}
-
-wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
-{
- return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;
-}
-
-wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
-{
- // axis orientation is not taken into account for conversion of a distance
- return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
-}
-
// ---------------------------------------------------------------------------
// bit blit
// ---------------------------------------------------------------------------
-bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
+
+bool wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY,
wxCoord dstWidth, wxCoord dstHeight,
wxDC *source,
wxCoord srcX, wxCoord srcY,
- int rop, bool useMask,
+ wxRasterOperationMode rop, bool useMask,
wxCoord srcMaskX, wxCoord srcMaskY)
{
return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
}
-bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
+bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
wxCoord dstWidth, wxCoord dstHeight,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
wxCoord srcWidth, wxCoord srcHeight,
- int rop, bool useMask,
+ wxRasterOperationMode rop, bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask)
{
- wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
+ wxCHECK_MSG( source, false, wxT("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
WXMICROWIN_CHECK_HDC_RET(false)
+ wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl );
+ if ( !implSrc )
+ {
+ // TODO: Do we want to be able to blit from other DCs too?
+ return false;
+ }
+
+ const HDC hdcSrc = GetHdcOf(*implSrc);
+
// if either the source or destination has alpha channel, we must use
// AlphaBlt() as other function don't handle it correctly
- const wxBitmap& bmpSrc = source->m_selectedBitmap;
- if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
- (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
+ const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap();
+ if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() ||
+ (m_selectedBitmap.IsOk() && m_selectedBitmap.HasAlpha())) )
{
if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
- xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*source), bmpSrc) )
+ xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) )
return true;
}
{
mask = bmpSrc.GetMask();
- if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) )
+ if ( !(bmpSrc.IsOk() && mask && mask->GetMaskBitmap()) )
{
// don't give assert here because this would break existing
// programs - just silently ignore useMask parameter
xsrcMask = xsrc; ysrcMask = ysrc;
}
- COLORREF old_textground = ::GetTextColor(GetHdc());
- COLORREF old_background = ::GetBkColor(GetHdc());
- if (m_textForegroundColour.Ok())
- {
- ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
- }
- if (m_textBackgroundColour.Ok())
- {
- ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
- }
+ wxTextColoursChanger textCol(GetHdc(), *this);
DWORD dwRop;
switch (rop)
(
GetHdc(),
xdest, ydest, dstWidth, dstHeight,
- GetHdcOf(*source),
+ hdcSrc,
xsrc, ysrc,
(HBITMAP)mask->GetMaskBitmap(),
xsrcMask, ysrcMask,
#if wxUSE_DC_CACHEING
// create a temp buffer bitmap and DCs to access it and the mask
- wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
+ wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc);
dc_mask = (HDC) dcCacheEntry1->m_dc;
wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
#else // !wxUSE_DC_CACHEING
// create a temp buffer bitmap and DCs to access it and the mask
- dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+ dc_mask = ::CreateCompatibleDC(hdcSrc);
dc_buffer = ::CreateCompatibleDC(GetHdc());
buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
// copy dest to buffer
- if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+ if ( !::BitBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
GetHdc(), xdest, ydest, SRCCOPY) )
{
wxLogLastError(wxT("BitBlt"));
}
-#ifndef __WXWINCE__
- StretchBltModeChanger changeMode(dc_buffer, COLORONCOLOR);
-#endif
+ SET_STRETCH_BLT_MODE(GetHdc());
// copy src to buffer using selected raster op
- if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
- GetHdcOf(*source), xsrc, ysrc, srcWidth, srcHeight, dwRop) )
+ if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+ hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )
{
wxLogLastError(wxT("StretchBlt"));
}
- // set masked area in buffer to BLACK (pixel value 0)
- COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
- COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
- if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
- dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
+ // set masked area in buffer to BLACK
{
- wxLogLastError(wxT("StretchBlt"));
- }
+ wxTextColoursChanger textCol2(GetHdc(), *wxBLACK, *wxWHITE);
+ if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+ dc_mask, xsrcMask, ysrcMask,
+ srcWidth, srcHeight, SRCAND) )
+ {
+ wxLogLastError(wxT("StretchBlt"));
+ }
- // set unmasked area in dest to BLACK
- ::SetBkColor(GetHdc(), RGB(0, 0, 0));
- ::SetTextColor(GetHdc(), RGB(255, 255, 255));
- if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight,
- dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
- {
- wxLogLastError(wxT("StretchBlt"));
- }
- ::SetBkColor(GetHdc(), prevBkCol); // restore colours to original values
- ::SetTextColor(GetHdc(), prevCol);
+ // set unmasked area in dest to BLACK
+ ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+ ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+ if ( !::StretchBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ dc_mask, xsrcMask, ysrcMask,
+ srcWidth, srcHeight, SRCAND) )
+ {
+ wxLogLastError(wxT("StretchBlt"));
+ }
+ } // restore the original text and background colours
// OR buffer to dest
- success = ::BitBlt(GetHdc(), xdest, ydest,
- (int)dstWidth, (int)dstHeight,
+ success = ::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
dc_buffer, 0, 0, SRCPAINT) != 0;
if ( !success )
{
// FIXME: use appropriate WinCE functions
#ifndef __WXWINCE__
const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
- if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
+ if ( bmpSrc.IsOk() && (caps & RC_STRETCHDIB) )
{
DIBSECTION ds;
wxZeroMemory(ds);
sizeof(ds),
&ds) == sizeof(ds) )
{
- StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
+ SET_STRETCH_BLT_MODE(GetHdc());
// Figure out what co-ordinate system we're supposed to specify
// ysrc in.
if ( hDIB > 0 )
{
// reflect ysrc
- ysrc = hDIB - (ysrc + dstHeight);
+ ysrc = hDIB - (ysrc + srcHeight);
}
if ( ::StretchDIBits(GetHdc(),
#endif
// __WXWINCE__
{
-#ifndef __WXWINCE__
- StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
-#endif
+ SET_STRETCH_BLT_MODE(GetHdc());
if ( !::StretchBlt
(
GetHdc(),
xdest, ydest, dstWidth, dstHeight,
- GetHdcOf(*source),
+ hdcSrc,
xsrc, ysrc, srcWidth, srcHeight,
dwRop
) )
{
- wxLogLastError(_T("StretchBlt"));
+ wxLogLastError(wxT("StretchBlt"));
}
else
{
if ( !success )
{
- if ( !::BitBlt
- (
- GetHdc(),
- xdest, ydest,
- (int)dstWidth, (int)dstHeight,
- GetHdcOf(*source),
- xsrc, ysrc,
- dwRop
- ) )
+ if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+ hdcSrc, xsrc, ysrc, dwRop) )
{
- wxLogLastError(_T("BitBlt"));
+ wxLogLastError(wxT("BitBlt"));
}
else
{
}
}
- ::SetTextColor(GetHdc(), old_textground);
- ::SetBkColor(GetHdc(), old_background);
-
return success;
}
-void wxDC::GetDeviceSize(int *width, int *height) const
+void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const
{
WXMICROWIN_CHECK_HDC
*height = ::GetDeviceCaps(GetHdc(), VERTRES);
}
-void wxDC::DoGetSizeMM(int *w, int *h) const
+void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
{
WXMICROWIN_CHECK_HDC
{
int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
- wxCHECK_RET( wTotal, _T("0 width device?") );
+ wxCHECK_RET( wTotal, wxT("0 width device?") );
*w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
}
{
int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
- wxCHECK_RET( hTotal, _T("0 height device?") );
+ wxCHECK_RET( hTotal, wxT("0 height device?") );
*h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
}
}
-wxSize wxDC::GetPPI() const
+wxSize wxMSWDCImpl::GetPPI() const
{
WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
return wxSize(x, y);
}
-// For use by wxWidgets only, unless custom units are required.
-void wxDC::SetLogicalScale(double x, double y)
-{
- WXMICROWIN_CHECK_HDC
-
- m_logicalScaleX = x;
- m_logicalScaleY = y;
-}
-
// ----------------------------------------------------------------------------
// DC caching
// ----------------------------------------------------------------------------
* entry for the bitmap, and two for the DCs. -- JACS
*/
-wxList wxDC::sm_bitmapCache;
-wxList wxDC::sm_dcCache;
+wxObjectList wxMSWDCImpl::sm_bitmapCache;
+wxObjectList wxMSWDCImpl::sm_dcCache;
wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)
{
::DeleteDC((HDC) m_dc);
}
-wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
+wxDCCacheEntry* wxMSWDCImpl::FindBitmapInCache(WXHDC dc, int w, int h)
{
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
return entry;
}
-wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
+wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
{
int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
wxList::compatibility_iterator node = sm_dcCache.GetFirst();
return entry;
}
-void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToBitmapCache(wxDCCacheEntry* entry)
{
sm_bitmapCache.Append(entry);
}
-void wxDC::AddToDCCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToDCCache(wxDCCacheEntry* entry)
{
sm_dcCache.Append(entry);
}
-void wxDC::ClearCache()
+void wxMSWDCImpl::ClearCache()
{
WX_CLEAR_LIST(wxList, sm_dcCache);
WX_CLEAR_LIST(wxList, sm_bitmapCache);
{
public:
virtual bool OnInit() { return true; }
- virtual void OnExit() { wxDC::ClearCache(); }
+ virtual void OnExit() { wxMSWDCImpl::ClearCache(); }
private:
DECLARE_DYNAMIC_CLASS(wxDCModule)
static bool AlphaBlt(HDC hdcDst,
int x, int y, int dstWidth, int dstHeight,
- int srcX, int srcY,
+ int srcX, int srcY,
int srcWidth, int srcHeight,
HDC hdcSrc,
const wxBitmap& bmp)
{
- wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
- wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
+ wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), wxT("AlphaBlt(): invalid bitmap") );
+ wxASSERT_MSG( hdcDst && hdcSrc, wxT("AlphaBlt(): invalid HDC") );
// do we have AlphaBlend() and company in the headers?
#if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
BLENDFUNCTION);
static AlphaBlend_t
- pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
+ pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(wxT("AlphaBlend"));
if ( pfnAlphaBlend )
{
BLENDFUNCTION bf;
return true;
}
- wxLogLastError(_T("AlphaBlend"));
+ wxLogLastError(wxT("AlphaBlend"));
}
#else
wxUnusedVar(hdcSrc);
// AlphaBlend() unavailable of failed: use our own (probably much slower)
// implementation
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
return true;
-#else // !wxHAVE_RAW_BITMAP
+#else // !wxHAS_RAW_BITMAP
// no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
// alpha but at least something will be shown like this)
wxUnusedVar(bmp);
return false;
-#endif // wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP/!wxHAS_RAW_BITMAP
}
// wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
static void
wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
int dstWidth, int dstHeight,
- int srcX, int srcY,
+ int srcX, int srcY,
int srcWidth, int srcHeight,
const wxBitmap& bmpSrc)
{
if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
{
- wxLogLastError(_T("BitBlt"));
+ wxLogLastError(wxT("BitBlt"));
}
// combine them with the source bitmap using alpha
dataSrc((wxBitmap &)bmpSrc);
wxCHECK_RET( dataDst && dataSrc,
- _T("failed to get raw data in wxAlphaBlend") );
+ wxT("failed to get raw data in wxAlphaBlend") );
wxAlphaPixelData::Iterator pDst(dataDst),
pSrc(dataSrc);
// and finally blit them back to the destination DC
if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
{
- wxLogLastError(_T("BitBlt"));
+ wxLogLastError(wxT("BitBlt"));
}
}
-#endif // #ifdef wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
-void wxDC::DoGradientFillLinear (const wxRect& rect,
+void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
const wxColour& initialColour,
const wxColour& destColour,
wxDirection nDirection)
typedef BOOL
(WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
static GradientFill_t pfnGradientFill =
- (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
+ (GradientFill_t)wxMSIMG32DLL.GetSymbol(wxT("GradientFill"));
if ( pfnGradientFill )
{
return;
}
- wxLogLastError(_T("GradientFill"));
+ wxLogLastError(wxT("GradientFill"));
}
#endif // wxUSE_DYNLIB_CLASS
- wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
+ wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
}
+#if wxUSE_DYNLIB_CLASS
+
static DWORD wxGetDCLayout(HDC hdc)
{
typedef DWORD (WINAPI *GetLayout_t)(HDC);
static GetLayout_t
- pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));
+ wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
- return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;
+ return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
}
-wxLayoutDirection wxDC::GetLayoutDirection() const
+wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
{
DWORD layout = wxGetDCLayout(GetHdc());
return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
}
-void wxDC::SetLayoutDirection(wxLayoutDirection dir)
+void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
{
typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
static SetLayout_t
- pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
- if ( !pfnSetLayout )
+ wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));
+ if ( !s_pfnSetLayout )
return;
if ( dir == wxLayout_Default )
else
layout &= ~LAYOUT_RTL;
- pfnSetLayout(GetHdc(), layout);
+ s_pfnSetLayout(GetHdc(), layout);
+}
+
+#else // !wxUSE_DYNLIB_CLASS
+
+// we can't provide RTL support without dynamic loading, so stub it out
+wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
+{
+ return wxLayout_Default;
}
+
+void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
+{
+}
+
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
projects / wxWidgets.git / blobdiff