X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2b0fa12c9cb341acce346c0e7794e099363cd01..26b833297883b4cbfdc9fd09d9882efe16f13f97:/src/msw/dc.cpp diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 8f586b56c8..c32a359fd1 100644 --- 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" @@ -47,6 +46,9 @@ #include #if wxUSE_COMMON_DIALOGS +#if wxUSE_NORLANDER_HEADERS + #include +#endif #include #endif @@ -54,6 +56,8 @@ #include #endif +#include "wx/msw/private.h" + #if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) #endif @@ -67,58 +71,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 // =========================================================================== @@ -225,7 +177,7 @@ void wxDC::DoSetClippingRegion(long cx, long cy, long cw, long ch) void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) { - wxCHECK_RET( region.GetHRGN(), _T("invalid clipping region") ); + wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") ); wxRect box = region.GetBox(); @@ -294,14 +246,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(), wxT("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()); @@ -420,8 +377,8 @@ void wxDC::DoDrawArc(long x1,long y1,long x2,long y2, long xc, long yc) Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2); - CalcBoundingBox((xc-radius), (yc-radius)); - CalcBoundingBox((xc+radius), (yc+radius)); + CalcBoundingBox((long)(xc-radius), (long)(yc-radius)); + CalcBoundingBox((long)(xc+radius), (long)(yc+radius)); } void wxDC::DoDrawPoint(long x, long y) @@ -558,7 +515,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); @@ -637,9 +594,11 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask ) HDC cdc = GetHdc(); HDC memdc = ::CreateCompatibleDC( cdc ); HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( ); + + wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") ); + ::SelectObject( memdc, hbitmap ); ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY); - ::SelectObject( memdc, 0 ); ::DeleteDC( memdc ); } else @@ -680,11 +639,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 +718,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(wxT("::SelectObject failed in wxDC::SetFont.")); } if (!m_oldFont) m_oldFont = (WXHFONT) f; @@ -868,10 +831,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 +930,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);