fixing osx_cocoa

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index d65b47e3e6a20af617f6c6acfa9bb464b8046137..a8b4420651dbc80747ec2d5311f89ecd47a41c46 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -35,6 +35,7 @@
 #ifndef WX_PRECOMP
     #include "wx/math.h"
     #include "wx/module.h"
 #ifndef WX_PRECOMP
     #include "wx/math.h"
     #include "wx/module.h"

+    #include "wx/window.h"

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -236,6 +237,12 @@ wxMemoryDC::wxMemoryDC(wxDC *dc)
 
 void wxMemoryDC::SelectObject(wxBitmap& bmp)
 {
 
 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
     // 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


@@ -921,9 +928,9 @@ void wxDCImpl::DoDrawSpline( const wxPointList *points )
     wx_spline_add_point(x1, y1);
 
     while ((node = node->GetNext())
     wx_spline_add_point(x1, y1);
 
     while ((node = node->GetNext())

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

            != NULL
            != NULL

-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS

           )
     {
         p = node->GetData();
           )
     {
         p = node->GetData();


@@ -1069,40 +1076,49 @@ void wxDCImpl::DoGradientFillConcentric(const wxRect& rect,
 
 
     //Radius
 
 
     //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)
     if (cx < cy)

-        nRadius = cx;
+        dRadius = cx;

     else
     else

-        nRadius = cy;
+        dRadius = cy;

 
     //Offset of circle
 
     //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
 
     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
 
             //normalize Gradient

-            if (nGradient < 0 )
-                nGradient = 0;
+            if (dGradient < 0)
+                dGradient = 0.0;

 
             //get dest colors
 
             //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
 
             //set the pixel

-            m_pen = wxColour(nR,nG,nB);
+            SetPen(wxColour(nR,nG,nB));

             DoDrawPoint(x + rect.GetLeft(), y + rect.GetTop());
         }
     }
             DoDrawPoint(x + rect.GetLeft(), y + rect.GetTop());
         }
     }


@@ -1119,6 +1135,27 @@ void wxDCImpl::InheritAttributes(wxWindow *win)
     SetLayoutDirection(win->GetLayoutDirection());
 }
 
     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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------


@@ -1146,7 +1183,7 @@ void wxDC::DrawLabel(const wxString& text,
     GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
 
     wxCoord width, height;
     GetMultiLineTextExtent(text, &widthText, &heightText, &heightLine);
 
     wxCoord width, height;

-    if ( bitmap.Ok() )
+    if ( bitmap.IsOk() )

     {
         width = widthText + bitmap.GetWidth();
         height = bitmap.GetHeight();
     {
         width = widthText + bitmap.GetWidth();
         height = bitmap.GetHeight();


@@ -1188,7 +1225,7 @@ void wxDC::DrawLabel(const wxString& text,
     wxCoord x0 = x,
             y0 = y,
             width0 = width;
     wxCoord x0 = x,
             y0 = y,
             width0 = width;

-    if ( bitmap.Ok() )
+    if ( bitmap.IsOk() )

     {
         DrawBitmap(bitmap, x, y, true /* use mask */);
 
     {
         DrawBitmap(bitmap, x, y, true /* use mask */);
 


@@ -1281,7 +1318,14 @@ void wxDC::DrawLabel(const wxString& text,
         // it should be of the same colour as text
         SetPen(wxPen(GetTextForeground(), 0, wxPENSTYLE_SOLID));
 
         // 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);
     }
 
         DrawLine(startUnderscore, yUnderscore, endUnderscore, yUnderscore);
     }


@@ -1559,7 +1603,7 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points,
             y2 = y2-y-y+1;
             --y;
         }
             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;
         if( bNewPoint && x>1)
         {
             int x1 = x - 1;