#ifndef WX_PRECOMP
#include "wx/math.h"
#include "wx/module.h"
+ #include "wx/window.h"
#endif
#ifdef __WXMSW__
#include "wx/dfb/dcscreen.h"
#endif
-#ifdef __WXPALMOS__
- #include "wx/palmos/dcclient.h"
- #include "wx/palmos/dcmemory.h"
- #include "wx/palmos/dcscreen.h"
-#endif
-
//----------------------------------------------------------------------------
// wxDCFactory
//----------------------------------------------------------------------------
void wxMemoryDC::SelectObject(wxBitmap& bmp)
{
+ if ( bmp.IsSameAs(GetSelectedBitmap()) )
+ {
+ // Nothing to do, this bitmap is already selected.
+ return;
+ }
+
// make sure that the given wxBitmap is not sharing its data with other
// wxBitmap instances as its contents will be modified by any drawing
// operation done on this DC
int i, j, lastOfs;
wxPoint* pts;
- wxPen pen;
for (i = j = lastOfs = 0; i < n; i++)
{
pts[j++] = pts[lastOfs];
}
- pen = GetPen();
- SetPen(wxPen(*wxBLACK, 0, wxPENSTYLE_TRANSPARENT));
- DoDrawPolygon(j, pts, xoffset, yoffset, fillStyle);
- SetPen(pen);
+ {
+ wxDCPenChanger setTransp(*m_owner, *wxTRANSPARENT_PEN);
+ DoDrawPolygon(j, pts, xoffset, yoffset, fillStyle);
+ }
+
for (i = j = 0; i < n; i++)
{
DoDrawLines(count[i], pts+j, xoffset, yoffset);
wx_spline_add_point(x1, y1);
while ((node = node->GetNext())
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
!= NULL
-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS
)
{
p = node->GetData();
//Radius
- wxInt32 cx = rect.GetWidth() / 2;
- wxInt32 cy = rect.GetHeight() / 2;
- wxInt32 nRadius;
+ double cx = rect.GetWidth() / 2;
+ double cy = rect.GetHeight() / 2;
+ double dRadius;
if (cx < cy)
- nRadius = cx;
+ dRadius = cx;
else
- nRadius = cy;
+ dRadius = cy;
//Offset of circle
- wxInt32 nCircleOffX = circleCenter.x - (rect.GetWidth() / 2);
- wxInt32 nCircleOffY = circleCenter.y - (rect.GetHeight() / 2);
+ double ptX, ptY;
+ ptX = circleCenter.x;
+ ptY = circleCenter.y;
+ double nCircleOffX = ptX - cx;
+ double nCircleOffY = ptY - cy;
+
+ double dGradient;
+ double dx, dy;
for ( wxInt32 x = 0; x < rect.GetWidth(); x++ )
{
for ( wxInt32 y = 0; y < rect.GetHeight(); y++ )
{
//get color difference
- wxInt32 nGradient = ((nRadius -
- (wxInt32)sqrt(
- pow((double)(x - cx - nCircleOffX), 2) +
- pow((double)(y - cy - nCircleOffY), 2)
- )) * 100) / nRadius;
+ dx = x;
+ dy = y;
+
+ dGradient = ((dRadius - sqrt( (dx - cx - nCircleOffX) * (dx - cx - nCircleOffX)
+ +(dy - cy - nCircleOffY) * (dy - cy - nCircleOffY)
+ )
+ ) * 100
+ ) / dRadius;
//normalize Gradient
- if (nGradient < 0 )
- nGradient = 0;
+ if (dGradient < 0)
+ dGradient = 0.0;
//get dest colors
- nR = (wxUint8)(nR1 + ((nR2 - nR1) * nGradient / 100));
- nG = (wxUint8)(nG1 + ((nG2 - nG1) * nGradient / 100));
- nB = (wxUint8)(nB1 + ((nB2 - nB1) * nGradient / 100));
+ nR = (wxUint8)(nR1 + ((nR2 - nR1) * dGradient / 100));
+ nG = (wxUint8)(nG1 + ((nG2 - nG1) * dGradient / 100));
+ nB = (wxUint8)(nB1 + ((nB2 - nB1) * dGradient / 100));
//set the pixel
- m_pen = wxColour(nR,nG,nB);
+ SetPen(wxColour(nR,nG,nB));
DoDrawPoint(x + rect.GetLeft(), y + rect.GetTop());
}
}
SetLayoutDirection(win->GetLayoutDirection());
}
+void wxDCImpl::DoGetFontMetrics(int *height,
+ int *ascent,
+ int *descent,
+ int *internalLeading,
+ int *externalLeading,
+ int *averageWidth) const
+{
+ // Average width is typically the same as width of 'x'.
+ wxCoord h, d;
+ DoGetTextExtent("x", averageWidth, &h, &d, externalLeading);
+
+ if ( height )
+ *height = h;
+ if ( ascent )
+ *ascent = h - d;
+ if ( descent )
+ *descent = d;
+ if ( internalLeading )
+ *internalLeading = 0;
+}
+
//-----------------------------------------------------------------------------
// wxDC
//-----------------------------------------------------------------------------
GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
wxCoord width, height;
- if ( bitmap.Ok() )
+ if ( bitmap.IsOk() )
{
width = widthText + bitmap.GetWidth();
height = bitmap.GetHeight();
wxCoord x0 = x,
y0 = y,
width0 = width;
- if ( bitmap.Ok() )
+ if ( bitmap.IsOk() )
{
DrawBitmap(bitmap, x, y, true /* use mask */);
yUnderscore = 0;
// split the string into lines and draw each of them separately
+ //
+ // NB: while wxDC::DrawText() on some platforms supports drawing multi-line
+ // strings natively, this is not the case for all of them, notably not
+ // wxMSW which uses this function for multi-line texts, so we may only
+ // call DrawText() for single-line strings from here to avoid infinite
+ // recursion.
wxString curLine;
for ( wxString::const_iterator pc = text.begin(); ; ++pc )
{
// it should be of the same colour as text
SetPen(wxPen(GetTextForeground(), 0, wxPENSTYLE_SOLID));
- yUnderscore--;
+ // This adjustment is relatively arbitrary: we need to draw the
+ // underline slightly higher to avoid overflowing the character cell
+ // but whether we should do it 1, 2 or 3 pixels higher is not clear.
+ //
+ // The currently used value seems to be compatible with native MSW
+ // behaviour, i.e. it results in the same appearance of the owner-drawn
+ // and normal labels.
+ yUnderscore -= 2;
DrawLine(startUnderscore, yUnderscore, endUnderscore, yUnderscore);
}
y2 = y2-y-y+1;
--y;
}
- // old y now to big: set point with old y, old x
+ // old y now too big: set point with old y, old x
if( bNewPoint && x>1)
{
int x1 = x - 1;
projects / wxWidgets.git / blobdiff