corrected hatched brushes emulation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 8e930cd837837a1dcd3f09938017fae94ba107fa..3ce14d0a3fffdd77d94cf616dc388448cc8f5af7 100644 (file)
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -778,54 +778,40 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
        
        wxCoord x1, x2 , y1 , y2 ;
   
        
        wxCoord x1, x2 , y1 , y2 ;
   

+    if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
+        return ;
+        
+       PolyHandle polygon = OpenPoly();
+       
+       x1 = XLOG2DEVMAC(points[0].x + xoffset);
+       y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+       ::MoveTo(x1,y1);
+
+       for (int i = 0; i < n-1; i++)
+       {
+               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
+               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
+               ::LineTo(x2, y2);
+       }
+
+       ClosePoly();
+

        if (m_brush.GetStyle() != wxTRANSPARENT)
        {
        if (m_brush.GetStyle() != wxTRANSPARENT)
        {

-               PolyHandle polygon = OpenPoly();
-               
-               x1 = XLOG2DEVMAC(points[0].x + xoffset);
-               y1 = YLOG2DEVMAC(points[0].y + yoffset);   
-               ::MoveTo(x1,y1);
-  
-               for (int i = 0; i < n-1; i++)
-               {
-               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
-               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
-               ::LineTo(x2, y2);
-               }
-
-               ClosePoly();

 
                MacInstallBrush();
                ::PaintPoly( polygon );
                
 
                MacInstallBrush();
                ::PaintPoly( polygon );
                

-               KillPoly( polygon );

        }
        
        if (m_pen.GetStyle() != wxTRANSPARENT) 
        {
        }
        
        if (m_pen.GetStyle() != wxTRANSPARENT) 
        {

-               PolyHandle polygon = OpenPoly();
-               
-               x1 = XLOG2DEVMAC(points[0].x + xoffset);
-               y1 = YLOG2DEVMAC(points[0].y + yoffset);   
-               ::MoveTo(x1,y1);
-  
-               for (int i = 0; i < n-1; i++)
-               {
-               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
-               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
-               ::LineTo(x2, y2);
-               }
-               
-               // return to origin to close path
-               ::LineTo(x1,y1);
-
-               ClosePoly();

        
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
                
        
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
                

-               KillPoly( polygon );

        }
        }

+       KillPoly( polygon );

 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)


@@ -1445,27 +1431,28 @@ void wxDC::MacInstallFont() const
 
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {
 
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {

-       int thePatListID = sysPatListID;
+    // we have our own pattern list now
+       int thePatListID = 128;

        int theIndex;
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:
        int theIndex;
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:

-                       theIndex = 34; // WCH: this is not good
+                       theIndex = 2; 

                        break;
                case wxFDIAGONAL_HATCH:
                        break;
                case wxFDIAGONAL_HATCH:

-                       theIndex = 26;
+                       theIndex = 3;

                        break;
                case wxCROSS_HATCH:
                        break;
                case wxCROSS_HATCH:

-                       theIndex = 5;
+                       theIndex = 4;

                        break;
                case wxHORIZONTAL_HATCH:
                        break;
                case wxHORIZONTAL_HATCH:

-                       theIndex = 25;
+                       theIndex = 5;

                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:
                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:

-                       theIndex = 4; // WCH: this is not good
+                       theIndex = 7; 

                        break;
                default:
                        theIndex = 1; // solid pattern
                        break;
                default:
                        theIndex = 1; // solid pattern

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 8e930cd837837a1dcd3f09938017fae94ba107fa..3ce14d0a3fffdd77d94cf616dc388448cc8f5af7 100644 (file)
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -778,54 +778,40 @@ void  wxDC::DoDrawPolygon(int n, wxPoint points[],
        
        wxCoord x1, x2 , y1 , y2 ;
   
        
        wxCoord x1, x2 , y1 , y2 ;
   

+    if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
+        return ;
+        
+       PolyHandle polygon = OpenPoly();
+       
+       x1 = XLOG2DEVMAC(points[0].x + xoffset);
+       y1 = YLOG2DEVMAC(points[0].y + yoffset);   
+       ::MoveTo(x1,y1);
+
+       for (int i = 0; i < n-1; i++)
+       {
+               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
+               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
+               ::LineTo(x2, y2);
+       }
+
+       ClosePoly();
+

        if (m_brush.GetStyle() != wxTRANSPARENT)
        {
        if (m_brush.GetStyle() != wxTRANSPARENT)
        {

-               PolyHandle polygon = OpenPoly();
-               
-               x1 = XLOG2DEVMAC(points[0].x + xoffset);
-               y1 = YLOG2DEVMAC(points[0].y + yoffset);   
-               ::MoveTo(x1,y1);
-  
-               for (int i = 0; i < n-1; i++)
-               {
-               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
-               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
-               ::LineTo(x2, y2);
-               }
-
-               ClosePoly();

 
                MacInstallBrush();
                ::PaintPoly( polygon );
                
 
                MacInstallBrush();
                ::PaintPoly( polygon );
                

-               KillPoly( polygon );

        }
        
        if (m_pen.GetStyle() != wxTRANSPARENT) 
        {
        }
        
        if (m_pen.GetStyle() != wxTRANSPARENT) 
        {

-               PolyHandle polygon = OpenPoly();
-               
-               x1 = XLOG2DEVMAC(points[0].x + xoffset);
-               y1 = YLOG2DEVMAC(points[0].y + yoffset);   
-               ::MoveTo(x1,y1);
-  
-               for (int i = 0; i < n-1; i++)
-               {
-               x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
-               y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
-               ::LineTo(x2, y2);
-               }
-               
-               // return to origin to close path
-               ::LineTo(x1,y1);
-
-               ClosePoly();

        
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
                
        
                MacInstallPen() ;
                ::FramePoly( polygon ) ;
                

-               KillPoly( polygon );

        }
        }

+       KillPoly( polygon );

 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)


@@ -1445,27 +1431,28 @@ void wxDC::MacInstallFont() const
 
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {
 
 static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
 {

-       int thePatListID = sysPatListID;
+    // we have our own pattern list now
+       int thePatListID = 128;

        int theIndex;
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:
        int theIndex;
        switch(hatchStyle)
        {
                case wxBDIAGONAL_HATCH:

-                       theIndex = 34; // WCH: this is not good
+                       theIndex = 2; 

                        break;
                case wxFDIAGONAL_HATCH:
                        break;
                case wxFDIAGONAL_HATCH:

-                       theIndex = 26;
+                       theIndex = 3;

                        break;
                case wxCROSS_HATCH:
                        break;
                case wxCROSS_HATCH:

-                       theIndex = 5;
+                       theIndex = 4;

                        break;
                case wxHORIZONTAL_HATCH:
                        break;
                case wxHORIZONTAL_HATCH:

-                       theIndex = 25;
+                       theIndex = 5;

                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:
                        break;
                case wxVERTICAL_HATCH:
                        theIndex = 6;
                        break;
                case wxCROSSDIAG_HATCH:

-                       theIndex = 4; // WCH: this is not good
+                       theIndex = 7; 

                        break;
                default:
                        theIndex = 1; // solid pattern
                        break;
                default:
                        theIndex = 1; // solid pattern