Better vertical height for choice/combo

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 782f1d7a30f86342fe89008482e23a60c6bd9be7..52359ee58681d58fe6f09533f5a67f39e41892ea 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/dcbase.cpp
+// Name:        src/common/dcbase.cpp

 // Purpose:     generic methods of the wxDC Class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     generic methods of the wxDC Class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,14 +25,23 @@
 #endif
 
 #include "wx/dc.h"
 #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;
 
 
 // bool wxDCBase::sm_cacheing = false;
 

+IMPLEMENT_ABSTRACT_CLASS(wxDCBase, wxObject)
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+IMPLEMENT_DYNAMIC_CLASS(wxBufferedDC, wxMemoryDC)
+IMPLEMENT_ABSTRACT_CLASS(wxBufferedPaintDC, wxBufferedDC)
+

 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {
 #if WXWIN_COMPATIBILITY_2_6
 void wxDCBase::BeginDrawing()
 {


@@ -55,8 +64,9 @@ void wxDCBase::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 
     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
 
     // we're drawing a scaled version of wx/generic/tick.xpm here
     wxCoord x3 = x1 + (4*width) / 10,   // x of the tick bottom


@@ -321,7 +331,7 @@ void wxDCBase::DoDrawSpline( wxList *points )
     double           x1, y1, x2, y2;
 
     wxList::compatibility_iterator node = points->GetFirst();
     double           x1, y1, x2, y2;
 
     wxList::compatibility_iterator node = points->GetFirst();

-    if (node == wxList::compatibility_iterator())
+    if (!node)

         // empty list
         return;
 
         // empty list
         return;
 


@@ -412,7 +422,7 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
 {
     int totalWidth = 0;
 
 {
     int totalWidth = 0;
 

-    const size_t len = text.Length();
+    const size_t len = text.length();

     widths.Empty();
     widths.Add(0, len);
 
     widths.Empty();
     widths.Add(0, len);
 


@@ -771,7 +781,7 @@ void wxDCBase::DoGradientFillLinear(const wxRect& rect,
     SetPen(oldPen);
 }
 
     SetPen(oldPen);
 }
 

-void wxDCBase::GradientFillConcentric(const wxRect& rect,
+void wxDCBase::DoGradientFillConcentric(const wxRect& rect,

                                       const wxColour& initialColour,
                                       const wxColour& destColour,
                                       const wxPoint& circleCenter)
                                       const wxColour& initialColour,
                                       const wxColour& destColour,
                                       const wxPoint& circleCenter)


@@ -817,9 +827,9 @@ void wxDCBase::GradientFillConcentric(const wxRect& rect,
                 nGradient = 0;
 
             //get dest colors
                 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));
 
             //set the pixel
             m_pen.SetColour(wxColour(nR,nG,nB));


@@ -885,13 +895,13 @@ void wxDCBase::DoDrawEllipticArcRot( wxCoord x, wxCoord y,
     list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) );
 
     // copy list into array and delete list elements
     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;
     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;
         points[i].x = point->x;
         points[i].y = point->y;
         delete point;


@@ -924,9 +934,9 @@ void wxDCBase::Rotate( wxList* points, double angle, wxPoint center )
         double pi(M_PI);
         double dSinA = -sin(angle*2.0*pi/360.0);
         double dCosA = cos(angle*2.0*pi/360.0);
         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;
 
             // transform coordinates, if necessary
             if( center.x ) point->x -= center.x;


@@ -1062,14 +1072,14 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
         bool bForceTurn = ( sq == eq && sa > ea );
         while( !bReady )
         {
         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 &&
                     (
             {
                 // 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

                     )
                   )
                 {
                     )
                   )
                 {


@@ -1081,16 +1091,16 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
                 {
                     if( q != eq || bForceTurn
                         ||
                 {
                     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
                       )
                     {
                         // copy point

-                        wxPoint* pPoint = new wxPoint( *((wxPoint*) node->Data() ) );
+                        wxPoint* pPoint = new wxPoint( *((wxPoint*) node->GetData() ) );

                         points->Append( (wxObject*) pPoint );
                     }
                         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;
                     }
                     {
                         bReady = true;
                     }


@@ -1106,38 +1116,38 @@ void wxDCBase::CalculateEllipticPoints( wxList* points,
         // delete points
         for( q = 0; q < 4; ++q )
         {
         // 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
     {
                 delete p;
             }
         }
     }
     else
     {

+        wxNode* node;

         // copy whole ellipse, wxPoints will be deleted outside
         // 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 );
         }
             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 );
         }
             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 );
         }
             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
             points->Append( p );
         }
     } // not iUseAngles
 } // CalculateEllipticPoints
 
 #endif

-