/////////////////////////////////////////////////////////////////////////////
-// Name: common/dcbase.cpp
+// Name: src/common/dcbase.cpp
// Purpose: generic methods of the wxDC Class
// Author: Vadim Zeitlin
// Modified by:
#endif
#include "wx/dc.h"
-#include "wx/math.h"
+#include "wx/dcbuffer.h" // for IMPLEMENT_DYNAMIC_CLASS
+
+#ifndef WX_PRECOMP
+ #include "wx/math.h"
+#endif
// bool wxDCBase::sm_cacheing = false;
+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+
// ============================================================================
// implementation
// ============================================================================
+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+
#if WXWIN_COMPATIBILITY_2_6
void wxDCBase::BeginDrawing()
{
wxCoord x2 = x1 + width,
y2 = y1 + height;
- // this is to yield width of 3 for width == height == 10
- SetPen(wxPen(GetTextForeground(), (width + height + 1) / 7, wxSOLID));
+ // the pen width is calibrated to give 3 for width == height == 10
+ wxDCPenChanger pen((wxDC&)*this,
+ wxPen(GetTextForeground(), (width + height + 1)/7));
// we're drawing a scaled version of wx/generic/tick.xpm here
wxCoord x3 = x1 + (4*width) / 10, // x of the tick bottom
double x1, y1, x2, y2;
wxList::compatibility_iterator node = points->GetFirst();
- if (node == wxList::compatibility_iterator())
+ if (!node)
// empty list
return;
{
int totalWidth = 0;
- const size_t len = text.Length();
+ const size_t len = text.length();
widths.Empty();
widths.Add(0, len);
wxCoord *x,
wxCoord *y,
wxCoord *h,
- wxFont *font)
+ wxFont *font) const
{
wxCoord widthTextMax = 0, widthLine,
heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
{
// save old pen
wxPen oldPen = m_pen;
-
- wxUint8 nR1 = destColour.Red();
- wxUint8 nG1 = destColour.Green();
- wxUint8 nB1 = destColour.Blue();
- wxUint8 nR2 = initialColour.Red();
- wxUint8 nG2 = initialColour.Green();
- wxUint8 nB2 = initialColour.Blue();
+ wxBrush oldBrush = m_brush;
+
+ wxUint8 nR1 = initialColour.Red();
+ wxUint8 nG1 = initialColour.Green();
+ wxUint8 nB1 = initialColour.Blue();
+ wxUint8 nR2 = destColour.Red();
+ wxUint8 nG2 = destColour.Green();
+ wxUint8 nB2 = destColour.Blue();
wxUint8 nR, nG, nB;
if ( nDirection == wxEAST || nDirection == wxWEST )
else
nB = nB1 + (nB2-nB1)*(w-x)/w;
- SetPen(wxPen(wxColour(nR, nG, nB), 1, wxSOLID));
+ wxColour colour(nR,nG,nB);
+ SetPen(wxPen(colour, 1, wxSOLID));
+ SetBrush(wxBrush(colour));
if(nDirection == wxEAST)
- DrawRectangle(rect.GetLeft()+x, rect.GetTop(),
+ DrawRectangle(rect.GetRight()-x-xDelta, rect.GetTop(),
xDelta, rect.GetHeight());
else //nDirection == wxWEST
- DrawRectangle(rect.GetRight()-x-xDelta, rect.GetTop(),
+ DrawRectangle(rect.GetLeft()+x, rect.GetTop(),
xDelta, rect.GetHeight());
}
}
else
nB = nB1 + (nB2-nB1)*(w-y)/w;
- SetPen(wxPen(wxColour(nR, nG, nB), 1, wxSOLID));
+ wxColour colour(nR,nG,nB);
+ SetPen(wxPen(colour, 1, wxSOLID));
+ SetBrush(wxBrush(colour));
if(nDirection == wxNORTH)
DrawRectangle(rect.GetLeft(), rect.GetTop()+y,
rect.GetWidth(), yDelta);
}
SetPen(oldPen);
+ SetBrush(oldBrush);
}
-void wxDCBase::GradientFillConcentric(const wxRect& rect,
+void wxDCBase::DoGradientFillConcentric(const wxRect& rect,
const wxColour& initialColour,
const wxColour& destColour,
const wxPoint& circleCenter)
nGradient = 0;
//get dest colors
- nR = nR1 + ((nR2 - nR1) * nGradient / 100);
- nG = nG1 + ((nG2 - nG1) * nGradient / 100);
- nB = nB1 + ((nB2 - nB1) * nGradient / 100);
+ nR = (wxUint8)(nR1 + ((nR2 - nR1) * nGradient / 100));
+ nG = (wxUint8)(nG1 + ((nG2 - nG1) * nGradient / 100));
+ nB = (wxUint8)(nB1 + ((nB2 - nB1) * nGradient / 100));
//set the pixel
m_pen.SetColour(wxColour(nR,nG,nB));
list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) );
// copy list into array and delete list elements
- int n = list.Number();
+ int n = list.GetCount();
wxPoint *points = new wxPoint[n];
int i = 0;
wxNode* node = 0;
- for ( node = list.First(); node; node = node->Next(), i++ )
+ for ( node = list.GetFirst(); node; node = node->GetNext(), i++ )
{
- wxPoint *point = (wxPoint *)node->Data();
+ wxPoint *point = (wxPoint *)node->GetData();
points[i].x = point->x;
points[i].y = point->y;
delete point;
double pi(M_PI);
double dSinA = -sin(angle*2.0*pi/360.0);
double dCosA = cos(angle*2.0*pi/360.0);
- for ( wxNode* node = points->First(); node; node = node->Next() )
+ for ( wxNode* node = points->GetFirst(); node; node = node->GetNext() )
{
- wxPoint* point = (wxPoint*)node->Data();
+ wxPoint* point = (wxPoint*)node->GetData();
// transform coordinates, if necessary
if( center.x ) point->x -= center.x;
bool bForceTurn = ( sq == eq && sa > ea );
while( !bReady )
{
- for( wxNode *node = pointsarray[q].First(); node; node = node->Next() )
+ for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
{
// once: go to starting point in start quadrant
if( !bStarted &&
(
- ( (wxPoint*) node->Data() )->x < xsa+1 && q <= 1
+ ( (wxPoint*) node->GetData() )->x < xsa+1 && q <= 1
||
- ( (wxPoint*) node->Data() )->x > xsa-1 && q >= 2
+ ( (wxPoint*) node->GetData() )->x > xsa-1 && q >= 2
)
)
{
{
if( q != eq || bForceTurn
||
- ( (wxPoint*) node->Data() )->x > xea+1 && q <= 1
+ ( (wxPoint*) node->GetData() )->x > xea+1 && q <= 1
||
- ( (wxPoint*) node->Data() )->x < xea-1 && q >= 2
+ ( (wxPoint*) node->GetData() )->x < xea-1 && q >= 2
)
{
// copy point
- wxPoint* pPoint = new wxPoint( *((wxPoint*) node->Data() ) );
+ wxPoint* pPoint = new wxPoint( *((wxPoint*) node->GetData() ) );
points->Append( (wxObject*) pPoint );
}
- else if( q == eq && !bForceTurn || ( (wxPoint*) node->Data() )->x == xea)
+ else if( q == eq && !bForceTurn || ( (wxPoint*) node->GetData() )->x == xea)
{
bReady = true;
}
// delete points
for( q = 0; q < 4; ++q )
{
- for( wxNode *node = pointsarray[q].First(); node; node = node->Next() )
+ for( wxNode *node = pointsarray[q].GetFirst(); node; node = node->GetNext() )
{
- wxPoint *p = (wxPoint *)node->Data();
+ wxPoint *p = (wxPoint *)node->GetData();
delete p;
}
}
}
else
{
+ wxNode* node;
// copy whole ellipse, wxPoints will be deleted outside
- for( wxNode *node = pointsarray[0].First(); node; node = node->Next() )
+ for( node = pointsarray[0].GetFirst(); node; node = node->GetNext() )
{
- wxObject *p = node->Data();
+ wxObject *p = node->GetData();
points->Append( p );
}
- for( node = pointsarray[1].First(); node; node = node->Next() )
+ for( node = pointsarray[1].GetFirst(); node; node = node->GetNext() )
{
- wxObject *p = node->Data();
+ wxObject *p = node->GetData();
points->Append( p );
}
- for( node = pointsarray[2].First(); node; node = node->Next() )
+ for( node = pointsarray[2].GetFirst(); node; node = node->GetNext() )
{
- wxObject *p = node->Data();
+ wxObject *p = node->GetData();
points->Append( p );
}
- for( node = pointsarray[3].First(); node; node = node->Next() )
+ for( node = pointsarray[3].GetFirst(); node; node = node->GetNext() )
{
- wxObject *p = node->Data();
+ wxObject *p = node->GetData();
points->Append( p );
}
} // not iUseAngles
} // CalculateEllipticPoints
#endif
-
projects / wxWidgets.git / blobdiff